diff --git a/AUTHORS b/AUTHORS
index d55e03f..d648cc7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 Chuck Forsberg: original rz and sz programs (Public domain version)
 Matt Porter <porter+@osu.edu>: Modification for versions 0.10 und 0.11
 mblack@csihq.com: Modifications for version 0.12a 
-Uwe Ohse <uwe@ohse.de>: Modifications for 0.12b und 0.12.1
+Uwe Ohse <uwe@ohse.de>: Modifications for 0.12b und 0.12.*
 
diff --git a/ChangeLog b/ChangeLog
index ee6c43a..233715c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+1998-06-15	Uwe Ohse  <uwe@ohse.de>
+
+	* src/rbsb.c (io_mode), case 1:
+	  disable IEXTEN, from Usman Muzaffar <usman@thynne.psych.nwu.edu>.
+
+1998-06-15	Uwe Ohse  <uwe@ohse.de>
+
+	* src/lsz.c: Transfering 0 byte files with Zmodem made lsz crash.
+
+1998-06-03	Uwe Ohse  <uwe@ohse.de>
+
+	* update to automake-1.4, autoconf-2.13.
+	
+	* configure.in:
+	- version number set to 0.12.21
+	- Threw out explicit AC_LINK_FILES statement in configure.in.
+
+1998-03-21 Uwe Ohse	<uwe@ohse.de>
+	* configure.in, aclocal.m4: check for socklen_t.
+	* check.lrzsz: threw out tcp inband checks.
+	* src/lrz.c: threw out tcp inband stuff (--tcp). The only
+	  user doesn't need it anymore.
+	  changed static SEGMENTS buffer to dynamic allocation.
+	  make some global variables static.
+	* src/lsz.c: threw out tcp inband stuff (--tcp). The only
+	  user doesn't need it anymore.
+	  allocate receive-buffer dynamically.
+	* src/tcp.c: change a size_t to socklen_t.
+	* zm.c: prototype for zsendline_s.
+
+1998-02-06	Uwe Ohse  <uwe@ohse.de>
+
+	* debian/*
+	* Makefile.am:
+	* configure.in:
+	  removed support for debian, on mail from
+	  Josip Rodin <joy@cibalia.gkvk.hr>.
+
 1998-12-29	Uwe Ohse  <uwe@ohse.de>
 
 	* src/lrz.c: removed stpcpy call.
diff --git a/INSTALL b/INSTALL
index ed340a8..0f5c1e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -42,13 +42,12 @@ To install:
      to install the programs and manual pages under the traditional
      names (sz, sz.1 instead of lsz, lsz.1).
 2) make
-   (please contact uwe@ohse.de if there are any problems. Sorry,
-   for the moment i only have access to linux machines)
+   (please contact uwe@ohse.de if there are any problems.)
 3) make check
    will perform a selftest, sending some files in the distribution 
-   through a nimed pipe.
+   through a named pipe.
    ("make vcheck" will do the same as "make check" does, but prints
-   a progres report)
+   a progress report)
 4) please read COMPATABILITY
 5) make install
    if everything is ok.
diff --git a/Makefile.am b/Makefile.am
index 0018eda..d7c5a79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,6 @@ noinst_SCRIPTS=systype
 PR=@PACKAGE@-@VERSION@
 CLEAN_FILES=fastcheck.done
 
-dist-hook:
-	mkdir $(distdir)/debian
-	cp -fa $(srcdir)/debian/changelog  $(distdir)/debian/
-	cp -fa $(srcdir)/debian/control  $(distdir)/debian/
-	cp -fa $(srcdir)/debian/copyright  $(distdir)/debian/
-	cp -fa $(srcdir)/debian/rules.in  $(distdir)/debian/
-
 oldcheck-local:
 	QUIET=-q $(srcdir)/check.lrzsz $(srcdir) `pwd`	
 
diff --git a/Makefile.in b/Makefile.in
index ec61527..f85ec33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,6 +49,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -92,32 +93,30 @@ VERSION = @VERSION@
 l = @l@
 
 SUBDIRS = lib intl src po man testsuite
-EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
-	README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests \
-	beos-runpiped.c fastcheck.beos
-noinst_SCRIPTS=systype
-PR=@PACKAGE@-@VERSION@
-CLEAN_FILES=fastcheck.done
+EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux 	README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests 	beos-runpiped.c fastcheck.beos
+
+noinst_SCRIPTS = systype
+PR = @PACKAGE@-@VERSION@
+CLEAN_FILES = fastcheck.done
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =  Specfile systype
 SCRIPTS =  $(noinst_SCRIPTS)
 
-DIST_COMMON =  README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \
-acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \
-configure.in install-sh missing mkinstalldirs stamp-h.in systype.in
+DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+INSTALL Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \
+acinclude.m4 aclocal.m4 config.guess config.h.in configure configure.in \
+install-sh missing mkinstalldirs systype.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
-GZIP = --best
-all: all-recursive-am all-am
-
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -127,22 +126,29 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 $(ACLOCAL_M4):  configure.in  acinclude.m4
 	cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
 config.h: stamp-h
-	@:
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
+	@echo timestamp > stamp-h 2> /dev/null
 $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
 $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
 mostlyclean-hdr:
 
@@ -153,9 +159,9 @@ distclean-hdr:
 
 maintainer-clean-hdr:
 Specfile: $(top_builddir)/config.status Specfile.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 systype: $(top_builddir)/config.status systype.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -170,41 +176,65 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+	  && mkid -f$$here/ID $$unique $(LISP)
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
@@ -230,29 +260,31 @@ top_distdir = $(distdir)
 # tarfile.
 distcheck: dist
 	-rm -rf $(distdir)
-	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
 	cd $(distdir)/=build \
 	  && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) \
-	  && $(MAKE) dvi \
-	  && $(MAKE) check \
-	  && $(MAKE) install \
-	  && $(MAKE) installcheck \
-	  && $(MAKE) dist
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
 	-rm -rf $(distdir)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
 dist: distdir
 	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 	-rm -rf $(distdir)
 dist-all: distdir
 	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 	-rm -rf $(distdir)
 distdir: $(DISTFILES)
 	-rm -rf $(distdir)
@@ -260,78 +292,82 @@ distdir: $(DISTFILES)
 	-chmod 777 $(distdir)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
 	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
 	done
-	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+info-am:
 info: info-recursive
+dvi-am:
 dvi: dvi-recursive
-check: all-am
-	$(MAKE) check-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
 installcheck: installcheck-recursive
 all-recursive-am: config.h
-	$(MAKE) all-recursive
-
-all-am: Makefile $(SCRIPTS) config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
+install-exec-am:
 install-exec: install-exec-recursive
-	@$(NORMAL_INSTALL)
 
+install-data-am:
 install-data: install-data-recursive
-	@$(NORMAL_INSTALL)
 
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-	@:
-
+uninstall-am:
 uninstall: uninstall-recursive
-
+all-am: Makefile $(SCRIPTS) config.h
+all-redirect: all-recursive-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
+installdirs-am:
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
-
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+mostlyclean: mostlyclean-recursive
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
-mostlyclean:  mostlyclean-recursive mostlyclean-am
+clean: clean-recursive
 
-clean:  clean-recursive clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
 
-distclean:  distclean-recursive distclean-am
+distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
@@ -340,19 +376,13 @@ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-dist-hook:
-	mkdir $(distdir)/debian
-	cp -fa $(srcdir)/debian/changelog  $(distdir)/debian/
-	cp -fa $(srcdir)/debian/control  $(distdir)/debian/
-	cp -fa $(srcdir)/debian/copyright  $(distdir)/debian/
-	cp -fa $(srcdir)/debian/rules.in  $(distdir)/debian/
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
 
 oldcheck-local:
 	QUIET=-q $(srcdir)/check.lrzsz $(srcdir) `pwd`	
diff --git a/acconfig.h b/acconfig.h
index acb1728..e1a6ad9 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -70,3 +70,7 @@
 
 /* define this if you headers conflict */
 #undef SYS_TIME_WITHOUT_SYS_SELECT
+
+/* define to type of socklen_t (int?) */
+#undef socklen_t
+
diff --git a/acinclude.m4 b/acinclude.m4
index d64b96b..d6cca61 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -73,3 +73,23 @@ if test $lrzsz_cv_header_sys_select = no; then
 fi
 ])
 
+AC_DEFUN(UO_TYPE_SOCKLEN_T,[
+AC_CACHE_CHECK([for socklen_t],ac_cv_type_socklen_t,
+    [AC_TRY_COMPILE([
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+    ],[socklen_t x=0;return x;]
+    ,ac_cv_type_socklen_t=yes,ac_cv_type_socklen_t=no)]
+)
+if test $ac_cv_type_socklen_t = no; then
+cat >> confdefs.h <<\EOF
+#define socklen_t int
+EOF
+  AC_DEFINE([socklen_t],int)
+fi
+]) dnl DEFUN
diff --git a/aclocal.m4 b/aclocal.m4
index 352aabf..e721fa7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999 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.
 
@@ -85,6 +85,26 @@ if test $lrzsz_cv_header_sys_select = no; then
 fi
 ])
 
+AC_DEFUN(UO_TYPE_SOCKLEN_T,[
+AC_CACHE_CHECK([for socklen_t],ac_cv_type_socklen_t,
+    [AC_TRY_COMPILE([
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+    ],[socklen_t x=0;return x;]
+    ,ac_cv_type_socklen_t=yes,ac_cv_type_socklen_t=no)]
+)
+if test $ac_cv_type_socklen_t = no; then
+cat >> confdefs.h <<\EOF
+#define socklen_t int
+EOF
+  AC_DEFINE([socklen_t],int)
+fi
+]) dnl DEFUN
 
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
@@ -96,7 +116,9 @@ dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -106,8 +128,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
@@ -119,15 +141,6 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
 #
 # Check to make sure that the build environment is sane.
 #
@@ -219,7 +232,7 @@ AC_REQUIRE([AC_PROG_CPP])
 AC_MSG_CHECKING([for function prototypes])
 if test "$am_cv_prog_cc_stdc" != no; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(PROTOTYPES)
+  AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes])
   U= ANSI2KNR=
 else
   AC_MSG_RESULT(no)
@@ -323,12 +336,12 @@ esac
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 3
+# serial 5
 
 AC_DEFUN(AM_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
@@ -370,9 +383,10 @@ AC_DEFUN(AM_WITH_NLS,
 	     AC_CHECK_LIB(intl, bindtextdomain,
 	       [AC_CACHE_CHECK([for gettext in libintl],
 		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])])
+		 [AC_CHECK_LIB(intl, gettext,
+		  gt_cv_func_gettext_libintl=yes,
+		  gt_cv_func_gettext_libintl=no)],
+		 gt_cv_func_gettext_libintl=no)])
 	   fi
 
 	   if test "$gt_cv_func_gettext_libc" = "yes" \
@@ -466,7 +480,7 @@ AC_DEFUN(AM_WITH_NLS,
 	  : ;
 	else
 	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
+	    [found xgettext program is not GNU xgettext; ignore it])
 	  XGETTEXT=":"
 	fi
       fi
@@ -478,6 +492,12 @@ AC_DEFUN(AM_WITH_NLS,
       nls_cv_header_intl=intl/libintl.h
       nls_cv_header_libgt=intl/libgettext.h
     fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
 
     # If this is used in GNU gettext we have to set USE_NLS to `yes'
     # because some of the sources are only built for this goal.
@@ -522,9 +542,9 @@ AC_DEFUN(AM_GNU_GETTEXT,
    AC_REQUIRE([AC_FUNC_MMAP])dnl
 
    AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
+unistd.h sys/param.h])
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
+strdup __argz_count __argz_stringify __argz_next])
 
    if test "${ac_cv_func_stpcpy+set}" != "set"; then
      AC_CHECK_FUNCS(stpcpy)
@@ -632,7 +652,7 @@ __argz_count __argz_stringify __argz_next])
 # Search path for a program which passes the given test.
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
@@ -680,7 +700,7 @@ AC_SUBST($1)dnl
 # Check whether LC_MESSAGES is available in <locale.h>.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
-# This file file be copied and used freely without restrictions.  It can
+# This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
diff --git a/check.lrzsz b/check.lrzsz
index 45fffc2..61efbed 100755
--- a/check.lrzsz
+++ b/check.lrzsz
@@ -43,7 +43,12 @@ for i in $objdir/src/l?z ; do
 	z_test_files="$z_test_files $i" 
 	y_test_files="$y_test_files $i" 
 done
-for i in /pub/gnu/emacs-1*.tar.gz ; do
+rm -f $objdir/null1 $objdir/null2
+touch $objdir/null1 $objdir/null2
+x_test_files="$objdir/null1 $x_test_files" 
+y_test_files="$objdir/null1 $y_test_files" 
+z_test_files="$objdir/null1 $objdir/null2 $z_test_files" 
+for i in /pub/gnu/emacs/emacs-2*.tar.gz ; do
 	if test -f "$i" ; then
 		z8_test_files="$z8_test_files $i" 
 		z_test_files="$z_test_files $i" 
@@ -68,7 +73,7 @@ if test "$mode" = all -o "$mode" = z ; then
 	mkdir $testdir/zmodem
 	failed=0
 	($SZ -q $SZBUFSIZE $z_test_files ) <$testdir/pipe | \
-		(cd $testdir/zmodem ; exec $RZ $RZBUFSIZE $QUIET >>../pipe )
+		(cd $testdir/zmodem ; echo "123" >null1 ; exec $RZ -y $RZBUFSIZE $QUIET >>../pipe )
 	for i in $z_test_files ; do 
 		bn=`basename $i`
 		cmp $i $testdir/zmodem/$bn
@@ -173,71 +178,6 @@ if test "$mode" = all -o "$mode" = z8N ; then
 	fi
 fi
 
-# test zmodem-tcp
-# inband tcp: stdin/out connection needed.
-if test "$mode" = all -o "$mode" = tcp ; then
-	echo "testing ZMODEMtcp"
-	mkdir $testdir/zmodemtcp
-	failed=0
-	($SZ --tcp -q $SZBUFSIZE $z_test_files ) <$testdir/pipe | \
-		(cd $testdir/zmodemtcp ; exec $RZ $RZBUFSIZE $QUIET >>../pipe )
-	for i in $z_test_files ; do 
-		bn=`basename $i`
-		cmp $i $testdir/zmodemtcp/$bn
-		if test $? -eq 0 ; then
-			rm -f $testdir/zmodemtcp/$bn
-		else
-			failed=1
-		fi
-	done
-	rmdir $testdir/zmodemtcp 2>&5
-	if test $failed = 1 ; then 
-		echo "ZMODEMtcp test failed"
-		any_failure="$any_failure ZMODEMtcp"
-	fi
-fi
-if test "$mode" = all -o "$mode" = tcp4 ; then
-	echo "testing ZMODEMtcp4k"
-	mkdir $testdir/zmodemtcp4k
-	failed=0
-	($SZ --tcp -q4 $SZBUFSIZE $z_test_files ) <$testdir/pipe | \
-		(cd $testdir/zmodemtcp4k ; exec $RZ $RZBUFSIZE $QUIET >>../pipe )
-	for i in $z_test_files ; do 
-		bn=`basename $i`
-		cmp $i $testdir/zmodemtcp4k/$bn
-		if test $? -eq 0 ; then
-			rm -f $testdir/zmodemtcp4k/$bn
-		else
-			failed=1
-		fi
-	done
-	rmdir $testdir/zmodemtcp4k 2>&5
-	if test $failed = 1 ; then 
-		echo "ZMODEMtcp4k test failed"
-		any_failure="$any_failure ZMODEMtcp4k"
-	fi
-fi
-if test "$mode" = all -o "$mode" = tcp8 ; then
-	echo "testing ZMODEMtcp8k"
-	mkdir $testdir/zmodemtcp8k
-	failed=0
-	($SZ --tcp -q8OT $SZBUFSIZE $z_test_files ) <$testdir/pipe | \
-		(cd $testdir/zmodemtcp8k ; exec $RZ $RZBUFSIZE $QUIET >>../pipe )
-	for i in $z_test_files ; do 
-		bn=`basename $i`
-		cmp $i $testdir/zmodemtcp8k/$bn
-		if test $? -eq 0 ; then
-			rm -f $testdir/zmodemtcp8k/$bn
-		else
-			failed=1
-		fi
-	done
-	rmdir $testdir/zmodemtcp8k 2>&5
-	if test $failed = 1 ; then 
-		echo "ZMODEMtcp8k test failed"
-		any_failure="$any_failure ZMODEMtcp8k"
-	fi
-fi
 # out-of-band tcp
 if test "$mode" = tcpo ; then
 	echo "testing ZMODEMtcpo"
@@ -847,6 +787,7 @@ if test "$mode" = all -o "$mode" = abuse ; then
 		( $RZ >>$testdir/pipe )
 fi
 
-#rm -rf $testdir
+rm -rf $testdir
+rm -f $objdir/null1 $objdir/null2
 exit 0
 
diff --git a/config.h.in b/config.h.in
index 4e1c86c..b78a5cc 100644
--- a/config.h.in
+++ b/config.h.in
@@ -110,9 +110,6 @@
 /* Define to 1 if your utime() takes struct utimbuf as second argument */
 #undef HAVE_STRUCT_UTIMBUF
 
-/* Define to 1 if ANSI function prototypes are usable.  */
-#undef PROTOTYPES
-
 /* Define to LOG_xxx (a syslog facility) if syslog() shall be used */
 #undef ENABLE_SYSLOG
 
@@ -150,6 +147,9 @@
 /* define this if you headers conflict */
 #undef SYS_TIME_WITHOUT_SYS_SELECT
 
+/* define to type of socklen_t (int?) */
+#undef socklen_t
+
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT
 
@@ -321,9 +321,6 @@
 /* Define if you have the <utime.h> header file.  */
 #undef HAVE_UTIME_H
 
-/* Define if you have the <values.h> header file.  */
-#undef HAVE_VALUES_H
-
 /* Define if you have the be library (-lbe).  */
 #undef HAVE_LIBBE
 
@@ -335,3 +332,13 @@
 
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
+/* Define if compiler has function prototypes */
+#undef PROTOTYPES
+
diff --git a/configure b/configure
index db26726..cc586d5 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -63,6 +63,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -346,7 +347,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -516,9 +517,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -558,28 +561,30 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:566: checking for a BSD compatible install" >&5
+echo "configure:570: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -609,13 +614,12 @@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:619: checking whether build environment is sane" >&5
+echo "configure:623: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -672,7 +676,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:676: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:680: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -699,9 +703,10 @@ else
 fi
 
 
+
 PACKAGE=lrzsz
 
-VERSION=0.12.20
+VERSION=0.12.21rc
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -718,7 +723,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:722: checking for working aclocal" >&5
+echo "configure:727: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -731,7 +736,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:735: checking for working autoconf" >&5
+echo "configure:740: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -744,7 +749,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:748: checking for working automake" >&5
+echo "configure:753: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -757,7 +762,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:761: checking for working autoheader" >&5
+echo "configure:766: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -770,7 +775,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:774: checking for working makeinfo" >&5
+echo "configure:779: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -916,18 +921,21 @@ EOF
 fi
 
 
+if test "x$CFLAGS" = x ; then old_cflags_empty=1; fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:923: checking for $ac_word" >&5
+echo "configure:930: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -948,16 +956,17 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:952: checking for $ac_word" >&5
+echo "configure:960: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -992,25 +1001,61 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1011: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1000: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 1010 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 1054 "configure"
 #include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:1014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1024,18 +1069,24 @@ else
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1034: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1039: checking whether we are using GNU C" >&5
+echo "configure:1090: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1044,7 +1095,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1055,11 +1106,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1063: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1074,20 +1129,24 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-O2"
+    CFLAGS="-g"
   fi
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1091: checking how to run the C preprocessor" >&5
+echo "configure:1150: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1102,14 +1161,14 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1106 "configure"
+#line 1165 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@ -1119,14 +1178,31 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1123 "configure"
+#line 1182 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 1199 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@ -1138,6 +1214,8 @@ else
 fi
 rm -f conftest*
 fi
+rm -f conftest*
+fi
 rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
@@ -1147,15 +1225,23 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
+if test "x$GCC" = xyes ; then
+    if test "x$old_cflags_empty" = x1 ; then
+        if test "x$_CFLAGS_OWG" != x  ; then
+            # each environment should contain at least one helpful hack :-)
+            CFLAGS="$_CFLAGS_OWG"
+        fi
+    fi
+fi
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1153: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1239: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 1159 "configure"
+#line 1245 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -1173,7 +1259,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 1177 "configure"
+#line 1263 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -1197,15 +1283,16 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1201: checking for $ac_word" >&5
+echo "configure:1287: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
@@ -1224,7 +1311,7 @@ else
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1228: checking for POSIXized ISC" >&5
+echo "configure:1315: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1245,9 +1332,9 @@ else
 fi
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1249: checking for AIX" >&5
+echo "configure:1336: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1251 "configure"
+#line 1338 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1270,18 +1357,18 @@ rm -f conftest*
 
 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1274: checking for minix/config.h" >&5
+echo "configure:1361: checking for minix/config.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1279 "configure"
+#line 1366 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1321,7 +1408,7 @@ fi
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1325: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1412: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1337,7 +1424,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
 do
   CC="$ac_save_CC $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 1341 "configure"
+#line 1428 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -1374,7 +1461,7 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 
 ; return 0; }
 EOF
-if { (eval echo configure:1378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -1400,7 +1487,7 @@ esac
 
 
 echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
-echo "configure:1404: checking for function prototypes" >&5
+echo "configure:1491: checking for function prototypes" >&5
 if test "$am_cv_prog_cc_stdc" != no; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
@@ -1413,12 +1500,12 @@ else
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1417: checking for ANSI C header files" >&5
+echo "configure:1504: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1422 "configure"
+#line 1509 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1426,8 +1513,8 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
@@ -1443,7 +1530,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1447 "configure"
+#line 1534 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1461,7 +1548,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1465 "configure"
+#line 1552 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1482,7 +1569,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1486 "configure"
+#line 1573 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1493,7 +1580,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1520,18 +1607,18 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1524: checking for $ac_hdr" >&5
+echo "configure:1611: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1529 "configure"
+#line 1616 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1559,12 +1646,12 @@ done
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1563: checking for working const" >&5
+echo "configure:1650: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1568 "configure"
+#line 1655 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1613,7 +1700,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1634,21 +1721,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1638: checking for inline" >&5
+echo "configure:1725: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1645 "configure"
+#line 1732 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1699,7 +1786,7 @@ EOF
 esac
 
 echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6
-echo "configure:1703: checking for syslog in -lsocket" >&5
+echo "configure:1790: checking for syslog in -lsocket" >&5
 ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1707,7 +1794,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1711 "configure"
+#line 1798 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1718,7 +1805,7 @@ int main() {
 syslog()
 ; return 0; }
 EOF
-if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1746,7 +1833,7 @@ else
 fi
 
 echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6
-echo "configure:1750: checking for syslog in -lbe" >&5
+echo "configure:1837: checking for syslog in -lbe" >&5
 ac_lib_var=`echo be'_'syslog | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1754,7 +1841,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbe  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1758 "configure"
+#line 1845 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1765,7 +1852,7 @@ int main() {
 syslog()
 ; return 0; }
 EOF
-if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1793,7 +1880,7 @@ else
 fi
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1797: checking for gethostbyname in -lnsl" >&5
+echo "configure:1884: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1801,7 +1888,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1805 "configure"
+#line 1892 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1812,7 +1899,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1841,12 +1928,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1845: checking for ANSI C header files" >&5
+echo "configure:1932: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 1937 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1854,8 +1941,8 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
@@ -1871,7 +1958,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1875 "configure"
+#line 1962 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1889,7 +1976,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1893 "configure"
+#line 1980 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1910,7 +1997,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1914 "configure"
+#line 2001 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1921,7 +2008,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1948,18 +2035,18 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h sys/times.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1952: checking for $ac_hdr" >&5
+echo "configure:2039: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1957 "configure"
+#line 2044 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1989,18 +2076,18 @@ for ac_hdr in termios.h sys/termios.h termio.h sys/termio.h sgtty.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1993: checking for $ac_hdr" >&5
+echo "configure:2080: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1998 "configure"
+#line 2085 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2029,18 +2116,18 @@ for ac_hdr in termios.h sys/termios.h termio.h sys/termio.h sgtty.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2033: checking for $ac_hdr" >&5
+echo "configure:2120: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2038 "configure"
+#line 2125 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2069,18 +2156,18 @@ for ac_hdr in sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2073: checking for $ac_hdr" >&5
+echo "configure:2160: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2078 "configure"
+#line 2165 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2109,18 +2196,18 @@ for ac_hdr in sys/select.h strings.h arpa/inet.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2113: checking for $ac_hdr" >&5
+echo "configure:2200: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2118 "configure"
+#line 2205 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2147,12 +2234,12 @@ done
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2151: checking for size_t" >&5
+echo "configure:2238: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2156 "configure"
+#line 2243 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2161,7 +2248,7 @@ else
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_size_t=yes
 else
@@ -2180,12 +2267,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2184: checking for mode_t" >&5
+echo "configure:2271: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2189 "configure"
+#line 2276 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2194,7 +2281,7 @@ else
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_mode_t=yes
 else
@@ -2213,12 +2300,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2217: checking for off_t" >&5
+echo "configure:2304: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2222 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2227,7 +2314,7 @@ else
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_off_t=yes
 else
@@ -2247,12 +2334,12 @@ fi
 
 
 echo $ac_n "checking for speed_t""... $ac_c" 1>&6
-echo "configure:2251: checking for speed_t" >&5
+echo "configure:2338: checking for speed_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_speed_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2256 "configure"
+#line 2343 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2302,12 +2389,12 @@ EOF
 fi
 
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:2306: checking for st_rdev in struct stat" >&5
+echo "configure:2393: checking for st_rdev in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2311 "configure"
+#line 2398 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -2315,7 +2402,7 @@ int main() {
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:2319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -2336,12 +2423,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2340: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2427: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2345 "configure"
+#line 2432 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2350,7 +2437,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2370,13 +2457,60 @@ EOF
 
 fi
 
+
+echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+echo "configure:2463: checking for socklen_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2468 "configure"
+#include "confdefs.h"
+
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+    
+int main() {
+socklen_t x=0;return x;
+    
+; return 0; }
+EOF
+if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_type_socklen_t=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_socklen_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_type_socklen_t" 1>&6
+if test $ac_cv_type_socklen_t = no; then
+cat >> confdefs.h <<\EOF
+#define socklen_t int
+EOF
+  cat >> confdefs.h <<\EOF
+#define socklen_t int
+EOF
+
+fi
+
 echo $ac_n "checking whether sys/time.h and sys/select.h may both be included""... $ac_c" 1>&6
-echo "configure:2375: checking whether sys/time.h and sys/select.h may both be included" >&5
+echo "configure:2509: checking whether sys/time.h and sys/select.h may both be included" >&5
 if eval "test \"`echo '$''{'lrzsz_cv_header_sys_select'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2380 "configure"
+#line 2514 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2385,7 +2519,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   lrzsz_cv_header_sys_select=yes
 else
@@ -2406,12 +2540,12 @@ EOF
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2410: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2544: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2415 "configure"
+#line 2549 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -2419,7 +2553,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:2423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -2441,19 +2575,19 @@ fi
 
 
 echo $ac_n "checking for errno declaration""... $ac_c" 1>&6
-echo "configure:2445: checking for errno declaration" >&5
+echo "configure:2579: checking for errno declaration" >&5
 if eval "test \"`echo '$''{'lrzsz_cv_decl_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2450 "configure"
+#line 2584 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 int i = errno; errno = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   lrzsz_cv_decl_errno=yes
 else
@@ -2476,7 +2610,7 @@ fi
 
 if test $cross_compiling = no ; then
 	echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:2480: checking whether setvbuf arguments are reversed" >&5
+echo "configure:2614: checking whether setvbuf arguments are reversed" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2484,7 +2618,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2488 "configure"
+#line 2622 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -2498,7 +2632,7 @@ main () {
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -2523,12 +2657,12 @@ fi
 
 fi
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2527: checking return type of signal handlers" >&5
+echo "configure:2661: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2532 "configure"
+#line 2666 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2545,7 +2679,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2567,18 +2701,18 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2571: checking for $ac_hdr" >&5
+echo "configure:2705: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2576 "configure"
+#line 2710 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2606,12 +2740,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2610: checking for $ac_func" >&5
+echo "configure:2744: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2615 "configure"
+#line 2749 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2634,7 +2768,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2659,7 +2793,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2663: checking for working mmap" >&5
+echo "configure:2797: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2667,7 +2801,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2671 "configure"
+#line 2805 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2807,7 +2941,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2832,19 +2966,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2836: checking for working alloca.h" >&5
+echo "configure:2970: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2841 "configure"
+#line 2975 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2865,25 +2999,30 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2869: checking for alloca" >&5
+echo "configure:3003: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2874 "configure"
+#line 3008 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
 # else
-#  ifdef _AIX
- #pragma alloca
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>
 #  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -2893,7 +3032,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2918,19 +3057,19 @@ if test $ac_cv_func_alloca_works = no; then
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.o
+  ALLOCA=alloca.${ac_objext}
   cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2929: checking whether alloca needs Cray hooks" >&5
+echo "configure:3068: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2934 "configure"
+#line 3073 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2955,12 +3094,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2959: checking for $ac_func" >&5
+echo "configure:3098: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2964 "configure"
+#line 3103 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2983,7 +3122,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3010,7 +3149,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3014: checking stack direction for C alloca" >&5
+echo "configure:3153: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3018,7 +3157,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3022 "configure"
+#line 3161 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -3037,7 +3176,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -3059,7 +3198,7 @@ EOF
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3063 "configure"
+#line 3202 "configure"
 #include "confdefs.h"
 #include <utime.h>
 EOF
@@ -3077,12 +3216,12 @@ rm -f conftest*
 for ac_func in gettimeofday settimeofday
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3081: checking for $ac_func" >&5
+echo "configure:3220: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3086 "configure"
+#line 3225 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3105,7 +3244,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3132,12 +3271,12 @@ done
 for ac_func in strchr memcpy select vprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3136: checking for $ac_func" >&5
+echo "configure:3275: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3141 "configure"
+#line 3280 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3160,7 +3299,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3187,12 +3326,12 @@ done
 for ac_func in times rdchk utime syslog siginterrupt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3191: checking for $ac_func" >&5
+echo "configure:3330: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3196 "configure"
+#line 3335 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3215,7 +3354,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3242,12 +3381,12 @@ done
 for ac_func in mkdir mktime strerror strstr strdup strtoul strtol strpbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3246: checking for $ac_func" >&5
+echo "configure:3385: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3251 "configure"
+#line 3390 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3270,7 +3409,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3291,7 +3430,7 @@ EOF
  
 else
   echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
 fi
 done
 
@@ -3299,12 +3438,12 @@ done
 for ac_func in stpcpy strftime vasprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3303: checking for $ac_func" >&5
+echo "configure:3442: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3308 "configure"
+#line 3447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3327,7 +3466,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3348,19 +3487,19 @@ EOF
  
 else
   echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
 fi
 done
 
 
 
 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
-echo "configure:3359: checking for getopt_long" >&5
+echo "configure:3498: checking for getopt_long" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3364 "configure"
+#line 3503 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getopt_long(); below.  */
@@ -3383,7 +3522,7 @@ getopt_long();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getopt_long=yes"
 else
@@ -3413,12 +3552,12 @@ EOF
 
 
 echo $ac_n "checking for ftime""... $ac_c" 1>&6
-echo "configure:3417: checking for ftime" >&5
+echo "configure:3556: checking for ftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3422 "configure"
+#line 3561 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char ftime(); below.  */
@@ -3441,7 +3580,7 @@ ftime();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_ftime=yes"
 else
@@ -3456,7 +3595,7 @@ fi
 if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6
-echo "configure:3460: checking that ftime works correctly" >&5
+echo "configure:3599: checking that ftime works correctly" >&5
 if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3464,7 +3603,7 @@ else
   lrzsz_cv_sys_ftime_ok=runtime
 else
   cat > conftest.$ac_ext <<EOF
-#line 3468 "configure"
+#line 3607 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3493,7 +3632,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   lrzsz_cv_sys_ftime_ok=yes
 else
@@ -3527,20 +3666,20 @@ fi
 
 
 echo $ac_n "checking for timezone variable""... $ac_c" 1>&6
-echo "configure:3531: checking for timezone variable" >&5
+echo "configure:3670: checking for timezone variable" >&5
 if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 3537 "configure"
+#line 3676 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 return(int)(timezone/2);
 ; return 0; }
 EOF
-if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   libquark_cv_var_timezone=yes
 else
@@ -3566,13 +3705,13 @@ if test "x$lookup_facility" = x ; then
 	:
 else
 	echo $ac_n "checking for $lookup_facility""... $ac_c" 1>&6
-echo "configure:3570: checking for $lookup_facility" >&5
+echo "configure:3709: checking for $lookup_facility" >&5
 	if eval "test \"`echo '$''{'lrzsz_cv_lookup_facility'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3576 "configure"
+#line 3715 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYSLOG_H
@@ -3620,22 +3759,22 @@ fi
 
                               
    for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h
+unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3628: checking for $ac_hdr" >&5
+echo "configure:3767: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3633 "configure"
+#line 3772 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3661,15 +3800,15 @@ fi
 done
 
    for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next
+strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3668: checking for $ac_func" >&5
+echo "configure:3807: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3673 "configure"
+#line 3812 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3692,7 +3831,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3721,12 +3860,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3725: checking for $ac_func" >&5
+echo "configure:3864: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3730 "configure"
+#line 3869 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3749,7 +3888,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3783,19 +3922,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3787: checking for LC_MESSAGES" >&5
+echo "configure:3926: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3792 "configure"
+#line 3931 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -3816,7 +3955,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3820: checking whether NLS is requested" >&5
+echo "configure:3959: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3836,7 +3975,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3840: checking whether included gettext is requested" >&5
+echo "configure:3979: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -3855,18 +3994,18 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3859: checking for libintl.h" >&5
+echo "configure:3998: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3864 "configure"
+#line 4003 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3882,19 +4021,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3886: checking for gettext in libc" >&5
+echo "configure:4025: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3891 "configure"
+#line 4030 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -3910,7 +4049,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3914: checking for bindtextdomain in -lintl" >&5
+echo "configure:4053: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3918,7 +4057,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3922 "configure"
+#line 4061 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3929,7 +4068,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3945,28 +4084,51 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3949: checking for gettext in libintl" >&5
+echo "configure:4088: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 3954 "configure"
+  echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
+echo "configure:4093: checking for gettext in -lintl" >&5
+ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lintl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4101 "configure"
 #include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gettext();
 
 int main() {
-return (int) gettext ("")
+gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gettext_libintl=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gettext_libintl=no
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  gt_cv_func_gettext_libintl=yes
+else
+  echo "$ac_t""no" 1>&6
+gt_cv_func_gettext_libintl=no
+fi
+
 fi
 
 echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
@@ -3985,7 +4147,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3989: checking for $ac_word" >&5
+echo "configure:4151: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4019,12 +4181,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4023: checking for $ac_func" >&5
+echo "configure:4185: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4028 "configure"
+#line 4190 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4047,7 +4209,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4074,7 +4236,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4078: checking for $ac_word" >&5
+echo "configure:4240: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4082,9 +4244,13 @@ else
   /*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
@@ -4106,7 +4272,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4110: checking for $ac_word" >&5
+echo "configure:4276: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4138,7 +4304,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 4142 "configure"
+#line 4308 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4146,7 +4312,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -4169,7 +4335,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:4173: checking whether catgets can be used" >&5
+echo "configure:4339: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -4182,7 +4348,7 @@ fi
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:4186: checking for main in -li" >&5
+echo "configure:4352: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4190,14 +4356,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4194 "configure"
+#line 4360 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4225,12 +4391,12 @@ else
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:4229: checking for catgets" >&5
+echo "configure:4395: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
+#line 4400 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -4253,7 +4419,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -4275,7 +4441,7 @@ EOF
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4279: checking for $ac_word" >&5
+echo "configure:4445: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4283,9 +4449,13 @@ else
   /*)
   ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GENCAT="$ac_dir/$ac_word"
@@ -4307,7 +4477,7 @@ fi
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4311: checking for $ac_word" >&5
+echo "configure:4481: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4315,9 +4485,13 @@ else
   /*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
@@ -4340,7 +4514,7 @@ fi
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4344: checking for $ac_word" >&5
+echo "configure:4518: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4375,7 +4549,7 @@ fi
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4379: checking for $ac_word" >&5
+echo "configure:4553: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4433,7 +4607,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4437: checking for $ac_word" >&5
+echo "configure:4611: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4467,7 +4641,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4471: checking for $ac_word" >&5
+echo "configure:4645: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4475,9 +4649,13 @@ else
   /*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
@@ -4499,7 +4677,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4503: checking for $ac_word" >&5
+echo "configure:4681: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4546,7 +4724,7 @@ fi
 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 	  : ;
 	else
-	  echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
+	  echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
 	  XGETTEXT=":"
 	fi
       fi
@@ -4558,6 +4736,9 @@ fi
       nls_cv_header_intl=intl/libintl.h
       nls_cv_header_libgt=intl/libgettext.h
     fi
+    
+    
+
 
     # If this is used in GNU gettext we have to set USE_NLS to `yes'
     # because some of the sources are only built for this goal.
@@ -4589,7 +4770,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4593: checking for catalogs to be installed" >&5
+echo "configure:4774: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4617,18 +4798,18 @@ echo "configure:4593: checking for catalogs to be installed" >&5
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4621: checking for linux/version.h" >&5
+echo "configure:4802: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4626 "configure"
+#line 4807 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:4812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -4697,7 +4878,6 @@ cat >> confdefs.h <<EOF
 EOF
 
 
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -4721,7 +4901,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -4788,7 +4968,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -4800,7 +4980,7 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile intl/Makefile lib/Makefile testsuite/Makefile \
-man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
+man/Makefile po/Makefile.in src/Makefile Specfile systype \
 src/lrzszbug config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -4810,9 +4990,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -4832,8 +5014,8 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@PACKAGE@%$PACKAGE%g
 s%@VERSION@%$VERSION%g
 s%@ACLOCAL@%$ACLOCAL%g
@@ -4914,7 +5096,7 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile lib/Makefile testsuite/Makefile \
-man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
+man/Makefile po/Makefile.in src/Makefile Specfile systype \
 src/lrzszbug"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -5130,11 +5312,14 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 
+
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac
 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; 
-chmod +x debian/rules;
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 exit 0
 EOF
diff --git a/configure.in b/configure.in
index 429677e..e7aef76 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/crctab.c)
-AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
+AM_INIT_AUTOMAKE(lrzsz, 0.12.21rc)
 AM_CONFIG_HEADER(config.h)
 
 
@@ -83,8 +83,19 @@ AC_ARG_ENABLE(syslog,
 		lookup_facility=LOG_UUCP
 	  ])
 
+if test "x$CFLAGS" = x ; then old_cflags_empty=1; fi
+
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CPP
+if test "x$GCC" = xyes ; then
+    if test "x$old_cflags_empty" = x1 ; then
+        if test "x$_CFLAGS_OWG" != x  ; then
+            # each environment should contain at least one helpful hack :-)
+            CFLAGS="$_CFLAGS_OWG"
+        fi
+    fi
+fi
 AC_PROG_GCC_TRADITIONAL
 dnl AC_PROG_INSTALL  included in AM_INIT_AUTOMAKE
 dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
@@ -140,6 +151,7 @@ AC_TYPE_OFF_T
 LRZSZ_TYPE_SPEED_T
 AC_STRUCT_ST_RDEV
 AC_HEADER_TIME
+UO_TYPE_SOCKLEN_T
 lrzsz_HEADER_SYS_SELECT
 AC_STRUCT_TM
 LRZSZ_ERRNO_DECL
@@ -260,11 +272,10 @@ AC_SUBST(LIBS)
 AM_GNU_GETTEXT
 
 AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 
 AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
-man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
+man/Makefile po/Makefile.in src/Makefile Specfile systype \
 src/lrzszbug],
 [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; 
-chmod +x debian/rules;
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48e365c..04b392c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
 	strdup.c strerror.c strstr.c strpbrk.c strtol.c strtoul.c stpcpy.c \
 	strftime.c vasprintf.c
 
-libzmodem_a_SOURCES = long-options.c xstrtol.c xstrtoul.c error.c
+libzmodem_a_SOURCES = long-options.c xstrtol.c xstrtoul.c error.c 
 libzmodem_a_LIBADD  = @LIBOBJS@ @ALLOCA@
 libzmodem_a_DEPENDENCIES  = @ALLOCA@ @LIBOBJS@
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 663ac98..92927c6 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,6 +49,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -90,18 +91,16 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-noinst_LIBRARIES=libzmodem.a
-CFLAGS=@CFLAGS@
-AUTOMAKE_OPTIONS=ansi2knr
+noinst_LIBRARIES = libzmodem.a
+CFLAGS = @CFLAGS@
+AUTOMAKE_OPTIONS = ansi2knr
 
-EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
-	getopt.c getopt1.c mkdir.c mktime.c \
-	strdup.c strerror.c strstr.c strpbrk.c strtol.c strtoul.c stpcpy.c \
-	strftime.c vasprintf.c
+EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c 	getopt.c getopt1.c mkdir.c mktime.c 	strdup.c strerror.c strstr.c strpbrk.c strtol.c strtoul.c stpcpy.c 	strftime.c vasprintf.c
 
-libzmodem_a_SOURCES = long-options.c xstrtol.c xstrtoul.c error.c
-libzmodem_a_LIBADD  = @LIBOBJS@ @ALLOCA@
-libzmodem_a_DEPENDENCIES  = @ALLOCA@ @LIBOBJS@
+
+libzmodem_a_SOURCES = long-options.c xstrtol.c xstrtoul.c error.c 
+libzmodem_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libzmodem_a_DEPENDENCIES = @ALLOCA@ @LIBOBJS@
 
 noinst_HEADERS = getopt.h long-options.h xstrtol.h xstrtoul.h error.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -116,8 +115,9 @@ ANSI2KNR = @ANSI2KNR@
 libzmodem_a_OBJECTS =  long-options$U.o xstrtol$U.o xstrtoul$U.o \
 error$U.o
 AR = ar
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in alloca.c ansi2knr.1 ansi2knr.c \
@@ -127,16 +127,15 @@ strftime.c strpbrk.c strstr.c strtol.c strtoul.c vasprintf.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
-GZIP = --best
+TAR = gtar
+GZIP_ENV = --best
 SOURCES = $(libzmodem_a_SOURCES)
 OBJECTS = $(libzmodem_a_OBJECTS)
 
-all: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS)
-
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -199,41 +198,41 @@ libzmodem.a: $(libzmodem_a_OBJECTS) $(libzmodem_a_DEPENDENCIES)
 	$(AR) cru libzmodem.a $(libzmodem_a_OBJECTS) $(libzmodem_a_LIBADD)
 	$(RANLIB) libzmodem.a
 alloca_.c: alloca.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | $(ANSI2KNR) alloca_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c
 error_.c: error.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | $(ANSI2KNR) error_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
 getopt_.c: getopt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | $(ANSI2KNR) getopt_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
 getopt1_.c: getopt1.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | $(ANSI2KNR) getopt1_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c
 long-options_.c: long-options.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/long-options.c; then echo $(srcdir)/long-options.c; else echo long-options.c; fi` | $(ANSI2KNR) long-options_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/long-options.c; then echo $(srcdir)/long-options.c; else echo long-options.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > long-options_.c
 mkdir_.c: mkdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | $(ANSI2KNR) mkdir_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkdir_.c
 mktime_.c: mktime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | $(ANSI2KNR) mktime_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c
 stpcpy_.c: stpcpy.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | $(ANSI2KNR) stpcpy_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c
 strdup_.c: strdup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | $(ANSI2KNR) strdup_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strdup_.c
 strerror_.c: strerror.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strerror.c; then echo $(srcdir)/strerror.c; else echo strerror.c; fi` | $(ANSI2KNR) strerror_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strerror.c; then echo $(srcdir)/strerror.c; else echo strerror.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strerror_.c
 strftime_.c: strftime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strftime.c; then echo $(srcdir)/strftime.c; else echo strftime.c; fi` | $(ANSI2KNR) strftime_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strftime.c; then echo $(srcdir)/strftime.c; else echo strftime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strftime_.c
 strpbrk_.c: strpbrk.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | $(ANSI2KNR) strpbrk_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strpbrk_.c
 strstr_.c: strstr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strstr.c; then echo $(srcdir)/strstr.c; else echo strstr.c; fi` | $(ANSI2KNR) strstr_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strstr.c; then echo $(srcdir)/strstr.c; else echo strstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strstr_.c
 strtol_.c: strtol.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strtol.c; then echo $(srcdir)/strtol.c; else echo strtol.c; fi` | $(ANSI2KNR) strtol_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtol.c; then echo $(srcdir)/strtol.c; else echo strtol.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtol_.c
 strtoul_.c: strtoul.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strtoul.c; then echo $(srcdir)/strtoul.c; else echo strtoul.c; fi` | $(ANSI2KNR) strtoul_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoul.c; then echo $(srcdir)/strtoul.c; else echo strtoul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoul_.c
 vasprintf_.c: vasprintf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/vasprintf.c; then echo $(srcdir)/vasprintf.c; else echo vasprintf.c; fi` | $(ANSI2KNR) vasprintf_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vasprintf.c; then echo $(srcdir)/vasprintf.c; else echo vasprintf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vasprintf_.c
 xstrtol_.c: xstrtol.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/xstrtol.c; then echo $(srcdir)/xstrtol.c; else echo xstrtol.c; fi` | $(ANSI2KNR) xstrtol_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtol.c; then echo $(srcdir)/xstrtol.c; else echo xstrtol.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtol_.c
 xstrtoul_.c: xstrtoul.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoul.c; then echo $(srcdir)/xstrtoul.c; else echo xstrtoul.c; fi` | $(ANSI2KNR) xstrtoul_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoul.c; then echo $(srcdir)/xstrtoul.c; else echo xstrtoul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoul_.c
 alloca_.o error_.o getopt_.o getopt1_.o long-options_.o mkdir_.o \
 mktime_.o stpcpy_.o strdup_.o strerror_.o strftime_.o strpbrk_.o \
 strstr_.o strtol_.o strtoul_.o vasprintf_.o xstrtol_.o xstrtoul_.o : \
@@ -242,8 +241,12 @@ $(ANSI2KNR)
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+	  && mkid -f$$here/ID $$unique $(LISP)
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
@@ -271,79 +274,92 @@ subdir = lib
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
 error.o: error.c ../config.h
 long-options.o: long-options.c ../config.h getopt.h long-options.h
 xstrtol.o: xstrtol.c ../config.h xstrtol.h
 xstrtoul.o: xstrtoul.c xstrtol.c ../config.h xstrtol.h
 
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS)
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
 		mostlyclean-generic
 
-clean:  clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \
-		clean-tags clean-generic mostlyclean
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \
+		clean-tags clean-generic mostlyclean-am
 
-distclean:  distclean-noinstLIBRARIES distclean-compile \
+clean: clean-am
+
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-krextra distclean-kr distclean-tags \
-		distclean-generic clean
-	-rm -f config.status
+		distclean-generic clean-am
+
+distclean: distclean-am
 
-maintainer-clean:  maintainer-clean-noinstLIBRARIES \
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-krextra \
 		maintainer-clean-kr maintainer-clean-tags \
-		maintainer-clean-generic distclean
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
+maintainer-clean: maintainer-clean-am
+
 .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-krextra distclean-krextra \
 clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
 clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/error.c b/lib/error.c
index 8f679c7..8b96b91 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 
-#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
+#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC || defined(__cplusplus)
+# if __STDC__ || defined(__cplusplus)
 #  include <stdarg.h>
 #  define VA_START(args, lastarg) va_start(args, lastarg)
 # else
@@ -108,7 +108,7 @@ error (status, errnum, message, va_alist)
      va_dcl
 #endif
 {
-#ifdef VA_START
+#if defined(VA_START)
   va_list args;
 #endif
 
@@ -120,8 +120,8 @@ error (status, errnum, message, va_alist)
       fprintf (stderr, "%s: ", program_name);
     }
 
-#ifdef VA_START
-  VA_START (args, message);
+#if defined(VA_START)
+  VA_START(args, message);
 # if HAVE_VPRINTF || _LIBC
   vfprintf (stderr, message, args);
 # else
diff --git a/lib/long-options.c b/lib/long-options.c
index 76b9796..fe069fd 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -34,12 +34,17 @@ static struct option const long_options[] =
 
 /* Process long options --help and --version, but only if argc == 2.
    Be careful not to gobble up `--'.  */
+#ifdef __cplusplus
+void parse_long_options (int argc, char **argv,
+	void (*version)(void), void (*usage)(int))
+#else
 void
 parse_long_options (argc, argv,version, usage)
      int argc;
      char **argv;
      void (*version)();
      void (*usage)();
+#endif
 {
   int c;
   int saved_opterr;
@@ -60,7 +65,7 @@ parse_long_options (argc, argv,version, usage)
 	  (*usage) (0);
 
 	case 'v':
-	  (*version) (0);
+	  (*version) ();
 	  /* printf ("%s (%s) %s\n", command_name, package, version_string); */
 	  exit (0);
 
diff --git a/lib/strerror.c b/lib/strerror.c
index f70a712..e2419e6 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -1,23 +1,16 @@
 /* strerror.c -- strerror() replacement
-   Copyright (C) 1996 Uwe Ohse
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ * Copyright (C) 1996 Uwe Ohse
+ * 
+ * This has been placed in the public domain: do with it what you want.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * 
+ */
 
 char *
-strerror(num)
-	int num;
+strerror(int num)
 {
 	extern char *sys_errlist[];
 	extern int sys_nerr;
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 8755cf4..d7b4b56 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -70,12 +70,17 @@ __unsigned long int __strtol ();
 /* FIXME: comment.  */
 
 strtol_error
+#ifdef __cplusplus
+__xstrtol (const char *s, char **ptr, int base, 
+		__unsigned long int *val, const char *valid_suffixes)
+#else
 __xstrtol (s, ptr, base, val, valid_suffixes)
      const char *s;
      char **ptr;
      int base;
      __unsigned long int *val;
      const char *valid_suffixes;
+#endif
 {
   char *t_ptr;
   char **p;
diff --git a/man/Makefile.in b/man/Makefile.in
index 217134d..bd0ec92 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,6 +49,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -105,12 +106,11 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
-GZIP = --best
-all: Makefile $(MANS)
-
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -152,10 +152,10 @@ uninstall-man1:
 	done
 install-man: $(MANS)
 	@$(NORMAL_INSTALL)
-	$(MAKE) install-man1
+	$(MAKE) $(AM_MAKEFLAGS) install-man1
 uninstall-man:
 	@$(NORMAL_UNINSTALL)
-	$(MAKE) uninstall-man1
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
 tags: TAGS
 TAGS:
 
@@ -167,62 +167,74 @@ subdir = man
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: install-man
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-man
-
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-man
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-man
+uninstall: uninstall-am
+all-am: Makefile $(MANS)
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
 
-clean:  clean-generic mostlyclean
+clean: clean-am
 
-distclean:  distclean-generic clean
-	-rm -f config.status
+distclean-am:  distclean-generic clean-am
 
-maintainer-clean:  maintainer-clean-generic distclean
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
+maintainer-clean: maintainer-clean-am
+
 .PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
-distdir info dvi installcheck install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+distdir info-am info dvi-am dvi check check-am installcheck-am \
+installcheck install-exec-am install-exec install-data-am install-data \
+install-am install uninstall-am uninstall all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 0bbc538..b31c9db 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -45,41 +45,40 @@ const struct _msg_ent _msg_tbl[] = {
   {"send_pseudo %s: cannot write to tmpfile %s: %s", 36},
   {"send_pseudo %s: failed", 37},
   {"send_pseudo %s: ok", 38},
-  {"tcp protocol init failed\n", 39},
-  {"Answering TIMESYNC at %s", 40},
-  {"timezone", 41},
-  {"timezone unknown", 42},
-  {"Can't open any requested files.", 43},
-  {"security violation: not allowed to upload from %s", 44},
-  {"cannot open %s", 45},
-  {"is not a file: %s", 46},
-  {"%s/%s: error occured", 47},
-  {"skipped: %s", 48},
-  {"%s/%s: skipped", 49},
-  {"Bytes Sent:%7ld   BPS:%-8ld                        \n", 50},
-  {"Sending %s, %ld blocks: ", 51},
-  {"Give your local XMODEM receive command now.", 52},
-  {"Sending: %s\n", 53},
-  {"Timeout on pathname", 54},
-  {"Receiver Cancelled", 55},
-  {"No ACK on EOT", 56},
-  {"Xmodem sectors/kbytes sent: %3d/%2dk", 57},
-  {"Ymodem sectors/kbytes sent: %3d/%2dk", 58},
-  {"Cancelled", 59},
-  {"Timeout on sector ACK", 60},
-  {"NAK on sector", 61},
-  {"Got burst for sector ACK", 62},
-  {"Got %02x for sector ACK", 63},
-  {"Retry Count Exceeded", 64},
-  {"Try `%s --help' for more information.\n", 65},
-  {"%s version %s\n", 66},
-  {"Usage: %s [options] file ...\n", 67},
-  {"   or: %s [options] -{c|i} COMMAND\n", 68},
-  {"Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n", 69},
+  {"Answering TIMESYNC at %s", 39},
+  {"timezone", 40},
+  {"timezone unknown", 41},
+  {"Can't open any requested files.", 42},
+  {"security violation: not allowed to upload from %s", 43},
+  {"cannot open %s", 44},
+  {"is not a file: %s", 45},
+  {"%s/%s: error occured", 46},
+  {"skipped: %s", 47},
+  {"%s/%s: skipped", 48},
+  {"Bytes Sent:%7ld   BPS:%-8ld                        \n", 49},
+  {"Sending %s, %ld blocks: ", 50},
+  {"Give your local XMODEM receive command now.", 51},
+  {"Sending: %s\n", 52},
+  {"Timeout on pathname", 53},
+  {"Receiver Cancelled", 54},
+  {"No ACK on EOT", 55},
+  {"Xmodem sectors/kbytes sent: %3d/%2dk", 56},
+  {"Ymodem sectors/kbytes sent: %3d/%2dk", 57},
+  {"Cancelled", 58},
+  {"Timeout on sector ACK", 59},
+  {"NAK on sector", 60},
+  {"Got burst for sector ACK", 61},
+  {"Got %02x for sector ACK", 62},
+  {"Retry Count Exceeded", 63},
+  {"Try `%s --help' for more information.\n", 64},
+  {"%s version %s\n", 65},
+  {"Usage: %s [options] file ...\n", 66},
+  {"   or: %s [options] -{c|i} COMMAND\n", 67},
+  {"Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n", 68},
   {"\
     (X) = option applies to XMODEM only\n\
     (Y) = option applies to YMODEM only\n\
-    (Z) = option applies to ZMODEM only\n", 70},
+    (Z) = option applies to ZMODEM only\n", 69},
   {"\
   -+, --append                append to existing destination file (Z)\n\
   -2, --twostop               use 2 stop bits\n\
@@ -103,7 +102,7 @@ const struct _msg_ent _msg_tbl[] = {
   -L, --packetlen N           limit subpacket length to N bytes (Z)\n\
   -l, --framelen N            limit frame length to N bytes (l>=L) (Z)\n\
   -m, --min-bps N             stop transmission if BPS below N\n\
-  -M, --min-bps-time N          for at least N seconds (default: 120)\n", 71},
+  -M, --min-bps-time N          for at least N seconds (default: 120)\n", 70},
   {"\
   -n, --newer                 send file if source newer (Z)\n\
   -N, --newer-or-longer       send file if source newer or longer (Z)\n\
@@ -114,8 +113,8 @@ const struct _msg_ent _msg_tbl[] = {
   -R, --restricted            restricted, more secure mode\n\
   -q, --quiet                 quiet (no progress reports)\n\
   -s, --stop-at {HH:MM|+N}    stop transmission at HH:MM or in N seconds\n\
-      --tcp                   build a TCP connection to transmit files\n\
-      --tcp-server            open socket, wait for connection\n\
+      --tcp-server            open socket, wait for connection (Z)\n\
+      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n\
   -u, --unlink                unlink file after transmission\n\
   -U, --unrestrict            turn off restricted mode (if allowed to)\n\
   -v, --verbose               be verbose, provide debugging information\n\
@@ -126,38 +125,38 @@ const struct _msg_ent _msg_tbl[] = {
       --ymodem                use YMODEM protocol\n\
   -Z, --zmodem                use ZMODEM protocol\n\
 \n\
-short options use the same arguments as the long ones\n", 72},
-  {"got ZRQINIT", 73},
-  {"got ZCAN", 74},
-  {"blklen now %d\n", 75},
-  {"zsendfdata: bps rate %ld below min %ld", 76},
-  {"zsendfdata: reached stop time", 77},
-  {"Bytes Sent:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  ", 78},
-  {"calc_blklen: reduced to %d due to error\n", 79},
-  {"calc_blklen: returned old value %d due to low bpe diff\n", 80},
-  {"calc_blklen: old %ld, new %ld, d %ld\n", 81},
-  {"calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n", 82},
-  {"calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n", 83},
-  {"calc_blklen: returned %d as best\n", 84},
+short options use the same arguments as the long ones\n", 71},
+  {"got ZRQINIT", 72},
+  {"got ZCAN", 73},
+  {"blklen now %d\n", 74},
+  {"zsendfdata: bps rate %ld below min %ld", 75},
+  {"zsendfdata: reached stop time", 76},
+  {"Bytes Sent:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  ", 77},
+  {"calc_blklen: reduced to %d due to error\n", 78},
+  {"calc_blklen: returned old value %d due to low bpe diff\n", 79},
+  {"calc_blklen: old %ld, new %ld, d %ld\n", 80},
+  {"calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n", 81},
+  {"calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n", 82},
+  {"calc_blklen: returned %d as best\n", 83},
   {"\
 \n\
-countem: Total %d %ld\n", 85},
-  {"Bad escape sequence %x", 86},
-  {"Sender Canceled", 87},
-  {"TIMEOUT", 88},
-  {"Bad data subpacket", 89},
-  {"Data subpacket too long", 90},
-  {"Garbage count exceeded", 91},
-  {"Got %s", 92},
-  {"Retry %d: ", 93},
-  {"don't have settimeofday, will not set time\n", 94},
-  {"not running as root (this is good!), can not set time\n", 95},
-  {"bytes_per_error", 96},
-  {"bytes-per-error should be >100", 97},
-  {"O_SYNC not supported by the kernel", 98},
-  {"garbage on commandline", 99},
-  {"Usage: %s [options] [filename.if.xmodem]\n", 100},
-  {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 101},
+countem: Total %d %ld\n", 84},
+  {"Bad escape sequence %x", 85},
+  {"Sender Canceled", 86},
+  {"TIMEOUT", 87},
+  {"Bad data subpacket", 88},
+  {"Data subpacket too long", 89},
+  {"Garbage count exceeded", 90},
+  {"Got %s", 91},
+  {"Retry %d: ", 92},
+  {"don't have settimeofday, will not set time\n", 93},
+  {"not running as root (this is good!), can not set time\n", 94},
+  {"bytes_per_error", 95},
+  {"bytes-per-error should be >100", 96},
+  {"O_SYNC not supported by the kernel", 97},
+  {"garbage on commandline", 98},
+  {"Usage: %s [options] [filename.if.xmodem]\n", 99},
+  {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 100},
   {"\
   -+, --append                append to existing files\n\
   -a, --ascii                 ASCII transfer (change CR/LF to LF)\n\
@@ -183,6 +182,8 @@ countem: Total %d %ld\n", 85},
   -S, --timesync              request remote time (twice: set local time)\n\
       --syslog[=off]          turn syslog on or off, if possible\n\
   -t, --timeout N             set timeout to N tenths of a second\n\
+      --tcp-server            open socket, wait for connection (Z)\n\
+      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n\
   -u, --keep-uppercase        keep upper case filenames\n\
   -U, --unrestrict            disable restricted mode (if allowed to)\n\
   -v, --verbose               be verbose, provide debugging information\n\
@@ -192,43 +193,41 @@ countem: Total %d %ld\n", 85},
       --ymodem                use YMODEM protocol\n\
   -Z, --zmodem                use ZMODEM protocol\n\
 \n\
-short options use the same arguments as the long ones\n", 102},
-  {"%s waiting to receive.", 103},
-  {"\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n", 104},
-  {"%s: ready to receive %s", 105},
-  {"\rBytes received: %7ld   BPS:%-6ld                \r\n", 106},
+short options use the same arguments as the long ones\n", 101},
+  {"%s waiting to receive.", 102},
+  {"\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n", 103},
+  {"%s: ready to receive %s", 104},
+  {"\rBytes received: %7ld   BPS:%-6ld                \r\n", 105},
   {"\
 \r\n\
-%s: %s removed.\r\n", 107},
-  {"Pathname fetch returned EOT", 108},
-  {"Received dup Sector", 109},
-  {"Sync Error", 110},
-  {"CRC", 111},
-  {"Checksum", 112},
-  {"Sector number garbled", 113},
-  {"Sender Cancelled", 114},
-  {"Got 0%o sector header", 115},
-  {"file name ends with a /, skipped: %s\n", 116},
-  {"zmanag=%d, Lzmanag=%d\n", 117},
-  {"zconv=%d\n", 118},
-  {"file exists, skipped: %s\n", 119},
-  {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 120},
-  {"TIMESYNC: cannot set time: %s\n", 121},
-  {"cannot tmpfile() for tcp protocol synchronization", 122},
-  {"Topipe", 123},
-  {"Receiving: %s\n", 124},
-  {"Blocks received: %d", 125},
-  {"%s: %s exists\n", 126},
-  {"%s:\tSecurity Violation", 127},
-  {"remote command execution requested", 128},
-  {"not executed", 129},
-  {"got ZRINIT", 130},
-  {"Skipped", 131},
-  {"rzfile: bps rate %ld below min %ld", 132},
-  {"rzfile: reached stop time", 133},
-  {"\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  ", 134},
-  {"fgets for tcp protocol synchronization failed: ", 135},
-  {"file close error", 136},
+%s: %s removed.\r\n", 106},
+  {"Pathname fetch returned EOT", 107},
+  {"Received dup Sector", 108},
+  {"Sync Error", 109},
+  {"CRC", 110},
+  {"Checksum", 111},
+  {"Sector number garbled", 112},
+  {"Sender Cancelled", 113},
+  {"Got 0%o sector header", 114},
+  {"file name ends with a /, skipped: %s\n", 115},
+  {"zmanag=%d, Lzmanag=%d\n", 116},
+  {"zconv=%d\n", 117},
+  {"file exists, skipped: %s\n", 118},
+  {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 119},
+  {"TIMESYNC: cannot set time: %s\n", 120},
+  {"Topipe", 121},
+  {"Receiving: %s\n", 122},
+  {"Blocks received: %d", 123},
+  {"%s: %s exists\n", 124},
+  {"%s:\tSecurity Violation", 125},
+  {"remote command execution requested", 126},
+  {"not executed", 127},
+  {"got ZRINIT", 128},
+  {"Skipped", 129},
+  {"rzfile: bps rate %ld below min %ld", 130},
+  {"rzfile: reached stop time", 131},
+  {"\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  ", 132},
+  {"file close error", 133},
 };
 
-int _msg_tbl_length = 136;
+int _msg_tbl_length = 133;
diff --git a/po/de.gmo b/po/de.gmo
index e711ff4..270b0a0 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index dd5930b..9d9a575 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,11 +2,10 @@
 # Copyright (C) 1997 Uwe Ohse
 # Uwe Ohse <uwe@ohse.de>, 1997.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-30 08:49+0100\n"
+"POT-Creation-Date: 1999-08-22 21:00+0200\n"
 "PO-Revision-Date: 1997-06-01 19:00+0200\n"
 "Last-Translator: FULL NAME <uwe@ohse.de>\n"
 "Language-Team: none. try <uwe@ohse.de>\n"
@@ -18,7 +17,7 @@ msgstr ""
 msgid "io_mode(,2) in rbsb.c not implemented\n"
 msgstr "io_mode(2) in rbsb.c nicht implementiert\n"
 
-#: src/lrz.c:201 src/lsz.c:230
+#: src/lrz.c:196 src/lsz.c:230
 #, c-format
 msgid "caught signal %d; exiting"
 msgstr "erhielt Signal %d; Programmabbruch"
@@ -45,7 +44,7 @@ msgstr "Framel
 msgid "framelength out of range 32..%ld"
 msgstr "Argument der Option l außerhalb des Bereichs 32..%ld"
 
-#: src/lrz.c:323 src/lsz.c:450
+#: src/lrz.c:318 src/lsz.c:450
 msgid "min_bps"
 msgstr "minimale BPS-Rate"
 
@@ -53,269 +52,266 @@ msgstr "minimale BPS-Rate"
 msgid "min_bps must be >= 0"
 msgstr "minimale BPS-Rate muß >= 0 sein"
 
-#: src/lrz.c:329 src/lsz.c:458
+#: src/lrz.c:324 src/lsz.c:458
 msgid "min_bps_time"
 msgstr ""
 
-#: src/lrz.c:331 src/lsz.c:460
+#: src/lrz.c:326 src/lsz.c:460
 msgid "min_bps_time must be > 1"
 msgstr "Zeitfenster für minimale BPS-Rate muß > 1 Sekunde sein"
 
-#: src/lrz.c:347 src/lsz.c:484
+#: src/lrz.c:342 src/lsz.c:484
 msgid "hour to large (0..23)"
 msgstr "Stunde zu gross (0..23)"
 
-#: src/lrz.c:349 src/lsz.c:486
+#: src/lrz.c:344 src/lsz.c:486
 msgid "unparsable stop time\n"
 msgstr "unparsbare Endzeit\n"
 
-#: src/lrz.c:353 src/lsz.c:490
+#: src/lrz.c:348 src/lsz.c:490
 msgid "minute to large (0..59)"
 msgstr "Minute zu groß (0..59)"
 
-#: src/lrz.c:363 src/lrz.c:370 src/lsz.c:500 src/lsz.c:507
+#: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507
 msgid "stop time to small"
 msgstr "Stopzeit zu kurz"
 
-#: src/lrz.c:368 src/lsz.c:505
+#: src/lrz.c:363 src/lsz.c:505
 msgid "stop-at"
 msgstr ""
 
-#: src/lrz.c:399 src/lsz.c:516
+#: src/lrz.c:394 src/lsz.c:516
 msgid "timeout"
 msgstr "Timeout"
 
-#: src/lrz.c:401 src/lsz.c:518
+#: src/lrz.c:396 src/lsz.c:518
 msgid "timeout out of range 10..1000"
 msgstr "Argument der Option t außerhalb des Bereichs 10..1000"
 
-#: src/lrz.c:417 src/lsz.c:526
+#: src/lrz.c:412 src/lsz.c:526
 msgid "security violation: can't do that under restricted shell\n"
 msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n"
 
-#: src/lrz.c:407 src/lsz.c:533
+#: src/lrz.c:402 src/lsz.c:533
 msgid "window size"
 msgstr "Fenstergröße"
 
-#: src/lrz.c:432 src/lrz.c:439 src/lsz.c:556 src/lsz.c:563
+#: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563
 msgid "cannot turnoff syslog"
 msgstr "kann syslogging nicht abschalten"
 
-#: src/lrz.c:454 src/lsz.c:571
+#: src/lrz.c:449 src/lsz.c:571
 msgid "startup delay"
 msgstr "Startverzögerung"
 
-#: src/lrz.c:470 src/lrz.c:755 src/lrz.c:1117 src/lrz.c:1243 src/lrz.c:1300
-#: src/lrz.c:1317 src/lrz.c:1332 src/lrz.c:1431 src/lsz.c:583 src/lsz.c:692
-#: src/lsz.c:831 src/lsz.c:1080 src/zreadline.c:127
+#: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244
+#: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580
+#: src/lsz.c:596 src/lsz.c:693 src/lsz.c:828 src/lsz.c:1061
+#: src/zreadline.c:127
 msgid "out of memory"
 msgstr "Kein Speicher mehr frei"
 
-#: src/lrz.c:480 src/lsz.c:595
+#: src/lrz.c:475 src/lsz.c:592
 msgid "this program was never intended to be used setuid\n"
 msgstr "dieses Programm darf nicht setuid laufen\n"
 
-#: src/lsz.c:611 src/lsz.c:626
+#: src/lsz.c:612 src/lsz.c:627
 msgid "need at least one file to send"
 msgstr "es muß mindestens ein Name einer zu sendenden Datei angegeben werden"
 
-#: src/lsz.c:628
+#: src/lsz.c:629
 msgid "Can't send command in restricted mode\n"
 msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n"
 
-#: src/lrz.c:524 src/lsz.c:655
+#: src/lrz.c:527 src/lsz.c:656
 msgid "hostname too long\n"
 msgstr "Hostname zu lang\n"
 
-#: src/lrz.c:539 src/lsz.c:670
+#: src/lrz.c:542 src/lsz.c:671
 msgid "illegal server address\n"
 msgstr "Illegale Serveraddresse\n"
 
-#: src/lsz.c:709
+#: src/lsz.c:710
 msgid "can read only one file from stdin"
 msgstr "kann nur eine Datei von der Standardeingabe lesen"
 
-#: src/lrz.c:571 src/lsz.c:806
+#: src/lrz.c:574 src/lsz.c:803
 msgid "Transfer incomplete\n"
 msgstr "Übertragung nicht abgeschlossen\n"
 
-#: src/lrz.c:573 src/lsz.c:808
+#: src/lrz.c:576 src/lsz.c:805
 msgid "Transfer complete\n"
 msgstr "Übertragung abgeschlossen\n"
 
-#: src/lsz.c:841
+#: src/lsz.c:838
 #, c-format
 msgid "send_pseudo %s: cannot open tmpfile %s: %s"
 msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s"
 
-#: src/lsz.c:854
+#: src/lsz.c:851
 #, c-format
 msgid "send_pseudo %s: cannot lstat tmpfile %s: %s"
 msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s"
 
-#: src/lsz.c:862
+#: src/lsz.c:859
 #, c-format
 msgid "send_pseudo %s: avoiding symlink trap"
 msgstr "send_pseudo %s: vermied symlink Falle"
 
-#: src/lsz.c:873
+#: src/lsz.c:870
 #, c-format
 msgid "send_pseudo %s: cannot write to tmpfile %s: %s"
 msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s"
 
-#: src/lsz.c:882
+#: src/lsz.c:879
 #, c-format
 msgid "send_pseudo %s: failed"
 msgstr "send_pseudo %s: Fehlschlag"
 
-#: src/lsz.c:885
+#: src/lsz.c:882
 #, c-format
 msgid "send_pseudo %s: ok"
 msgstr "send_pseudo %s: Erfolg"
 
-#: src/lsz.c:912
-msgid "tcp protocol init failed\n"
-msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n"
-
-#: src/lsz.c:935
+#: src/lsz.c:916
 #, c-format
 msgid "Answering TIMESYNC at %s"
 msgstr "Beantworte Zeitsynchronisation um %s"
 
-#: src/lsz.c:940
+#: src/lsz.c:921
 msgid "timezone"
 msgstr "Zeitzone"
 
-#: src/lsz.c:943
+#: src/lsz.c:924
 msgid "timezone unknown"
 msgstr "Zeitzone unbekannt"
 
-#: src/lsz.c:972
+#: src/lsz.c:953
 msgid "Can't open any requested files."
 msgstr "Kann keine der angeforderten Dateien öffnen"
 
-#: src/lsz.c:1028
+#: src/lsz.c:1009
 #, c-format
 msgid "security violation: not allowed to upload from %s"
 msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten"
 
-#: src/lrz.c:1392 src/lsz.c:1046
+#: src/lrz.c:1384 src/lsz.c:1027
 #, c-format
 msgid "cannot open %s"
 msgstr "kann %s nicht öffnen"
 
-#: src/lsz.c:1101
+#: src/lsz.c:1082
 #, c-format
 msgid "is not a file: %s"
 msgstr "keine Datei: %s"
 
-#: src/lsz.c:1134 src/lsz.c:1149
+#: src/lsz.c:1115 src/lsz.c:1130
 #, c-format
 msgid "%s/%s: error occured"
 msgstr "%s/%s: Fehler aufgetreten"
 
-#: src/lsz.c:1138
+#: src/lsz.c:1119
 #, c-format
 msgid "skipped: %s"
 msgstr "übersprungen: %s"
 
-#: src/lsz.c:1141
+#: src/lsz.c:1122
 #, c-format
 msgid "%s/%s: skipped"
 msgstr "%s/%s: übersprungen"
 
-#: src/lsz.c:1168
+#: src/lsz.c:1149
 #, c-format
 msgid "Bytes Sent:%7ld   BPS:%-8ld                        \n"
 msgstr "Bytes gesendet:%7ld   BPS:%-8ld                       \n"
 
-#: src/lsz.c:1197
+#: src/lsz.c:1178
 #, c-format
 msgid "Sending %s, %ld blocks: "
 msgstr "Sende %s, %ld Blöcke:"
 
-#: src/lsz.c:1200
+#: src/lsz.c:1181
 msgid "Give your local XMODEM receive command now."
 msgstr "Starten Sie nun Ihr XMODEM-Empfangsprogramm."
 
-#: src/lsz.c:1243
+#: src/lsz.c:1224
 #, c-format
 msgid "Sending: %s\n"
 msgstr "Sende: %s\n"
 
-#: src/lsz.c:1286
+#: src/lsz.c:1267
 msgid "Timeout on pathname"
 msgstr "Timeout beim Warten vor Pfadname"
 
-#: src/lsz.c:1333
+#: src/lsz.c:1314
 msgid "Receiver Cancelled"
 msgstr "Empfänger brach ab"
 
-#: src/lsz.c:1359
+#: src/lsz.c:1340
 msgid "No ACK on EOT"
 msgstr "Keine Bestätigung für Übertragungsende erhalten"
 
-#: src/lsz.c:1380
+#: src/lsz.c:1361
 #, c-format
 msgid "Xmodem sectors/kbytes sent: %3d/%2dk"
 msgstr "Ymodem Sektoren/Kilobytes gesendet: %3d/%2dk"
 
-#: src/lsz.c:1382
+#: src/lsz.c:1363
 #, c-format
 msgid "Ymodem sectors/kbytes sent: %3d/%2dk"
 msgstr "Ymodem Sektoren/Kilobytes gesendet: %3d/%2dk"
 
-#: src/lsz.c:1414
+#: src/lsz.c:1395
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/lsz.c:1418
+#: src/lsz.c:1399
 msgid "Timeout on sector ACK"
 msgstr "Timeout bei Sektorbestätigung"
 
-#: src/lsz.c:1423
+#: src/lsz.c:1404
 msgid "NAK on sector"
 msgstr "Sektor nicht bestätigt"
 
-#: src/lsz.c:1429
+#: src/lsz.c:1410
 msgid "Got burst for sector ACK"
 msgstr ""
 
-#: src/lsz.c:1431
+#: src/lsz.c:1412
 #, c-format
 msgid "Got %02x for sector ACK"
 msgstr "Erhielt %02x als Sektorbestätigung"
 
-#: src/lsz.c:1443
+#: src/lsz.c:1424
 msgid "Retry Count Exceeded"
 msgstr "Maximale Wiederholungsanzahl überschritten"
 
-#: src/lrz.c:593 src/lsz.c:1521
+#: src/lrz.c:596 src/lsz.c:1502
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' gibt weitere Informationen.\n"
 
-#: src/lrz.c:598 src/lsz.c:1526
+#: src/lrz.c:601 src/lsz.c:1507
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s Version %s\n"
 
-#: src/lsz.c:1529
+#: src/lsz.c:1510
 #, c-format
 msgid "Usage: %s [options] file ...\n"
 msgstr "Benutzung: %s [Optionen] Datei ...\n"
 
-#: src/lsz.c:1531
+#: src/lsz.c:1512
 #, c-format
 msgid "   or: %s [options] -{c|i} COMMAND\n"
-msgstr " oder: %s [-2Ceqv] -{c|i} KOMMANDO\n"
+msgstr " oder: %s [Optionen] -{c|i} KOMMANDO\n"
 
-#: src/lsz.c:1532
+#: src/lsz.c:1513
 msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n"
 msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n"
 
 # src/lrz.c:475 src/lsz.c:1330 xx
-#: src/lrz.c:604 src/lsz.c:1534
+#: src/lrz.c:607 src/lsz.c:1515
 msgid ""
 "    (X) = option applies to XMODEM only\n"
 "    (Y) = option applies to YMODEM only\n"
@@ -325,7 +321,7 @@ msgstr ""
 "    (Y) = Option gilt nur für YMODEM\n"
 "    (Z) = Option gilt nur für ZMODEM\n"
 
-#: src/lsz.c:1540
+#: src/lsz.c:1521
 msgid ""
 "  -+, --append                append to existing destination file (Z)\n"
 "  -2, --twostop               use 2 stop bits\n"
@@ -378,8 +374,7 @@ msgstr ""
 "  -m, --min-bps N             Übertragung abbrechen bei weniger als N BPS\n"
 "  -M, --min-bps-time N          für mindestens N Sekunden (Default: 120)\n"
 
-#: src/lsz.c:1565
-#, fuzzy
+#: src/lsz.c:1546
 msgid ""
 "  -n, --newer                 send file if source newer (Z)\n"
 "  -N, --newer-or-longer       send file if source newer or longer (Z)\n"
@@ -390,8 +385,8 @@ msgid ""
 "  -R, --restricted            restricted, more secure mode\n"
 "  -q, --quiet                 quiet (no progress reports)\n"
 "  -s, --stop-at {HH:MM|+N}    stop transmission at HH:MM or in N seconds\n"
-"      --tcp                   build a TCP connection to transmit files\n"
-"      --tcp-server            open socket, wait for connection\n"
+"      --tcp-server            open socket, wait for connection (Z)\n"
+"      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n"
 "  -u, --unlink                unlink file after transmission\n"
 "  -U, --unrestrict            turn off restricted mode (if allowed to)\n"
 "  -v, --verbose               be verbose, provide debugging information\n"
@@ -413,7 +408,8 @@ msgstr ""
 "  -R, --restricted            eingeschränkter, sichererer Modus\n"
 "  -q, --quiet                 leise, keine Ausgaben machen\n"
 "  -s, --stop-at {HH:MM|+N}    Übertragung um HH:MM oder in N Sek. abbrechen\n"
-"      --tcp                   TCP-Verbindung zum Übertragen verwenden\n"
+"      --tcp-server            Socket öffnen und auf Verbindung warten\n"
+"      --tcp-client ADDR:PORT  Socket öffnen und verbindung mit ...\n"
 "  -u, --unlink                Datei nach Übertragung löschen\n"
 "  -U, --unrestrict            eingeschränkten Modus aufheben (falls "
 "erlaubt)\n"
@@ -427,64 +423,64 @@ msgstr ""
 "\n"
 "Kurze Optionen benötigen dieselben Argumente wie Lange.\n"
 
-#: src/lsz.c:1786
+#: src/lsz.c:1768
 msgid "got ZRQINIT"
 msgstr "erhielt ZRQINIT"
 
-#: src/lrz.c:1074 src/lrz.c:1787 src/lsz.c:1792
+#: src/lrz.c:1079 src/lrz.c:1772 src/lsz.c:1774
 msgid "got ZCAN"
 msgstr "erhielt ZCAN"
 
-#: src/lsz.c:2000
+#: src/lsz.c:1991
 #, c-format
 msgid "blklen now %d\n"
 msgstr "Blockgröße nun %d\n"
 
-#: src/lsz.c:2062
+#: src/lsz.c:2053
 #, c-format
 msgid "zsendfdata: bps rate %ld below min %ld"
 msgstr "rzfile: BPS-Rate %ld unter Minimum %ld"
 
-#: src/lsz.c:2079
+#: src/lsz.c:2070
 msgid "zsendfdata: reached stop time"
 msgstr "rzfile: Abbruchzeit erreicht"
 
-#: src/lsz.c:2089
+#: src/lsz.c:2080
 #, c-format
 msgid "Bytes Sent:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  "
 msgstr "Bytes gesendet:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  "
 
-#: src/lsz.c:2228
+#: src/lsz.c:2223
 #, c-format
 msgid "calc_blklen: reduced to %d due to error\n"
 msgstr "calc_blklen: Blockgrösse auf %d reduziert wegen Fehler\n"
 
-#: src/lsz.c:2261
+#: src/lsz.c:2256
 #, c-format
 msgid "calc_blklen: returned old value %d due to low bpe diff\n"
 msgstr "calc_blklen: liefert alten Wert %d wegen geringer bpe Differenz\n"
 
-#: src/lsz.c:2263
+#: src/lsz.c:2258
 #, c-format
 msgid "calc_blklen: old %ld, new %ld, d %ld\n"
 msgstr "calc_blklen: alt %ld, neu %ld, Differenz %ld\n"
 
-#: src/lsz.c:2272
+#: src/lsz.c:2267
 #, c-format
 msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n"
 msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%le, ec=%ld\n"
 
-#: src/lsz.c:2283
+#: src/lsz.c:2278
 #, c-format
 msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n"
 msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n"
 
-#: src/lsz.c:2295
+#: src/lsz.c:2290
 #, c-format
 msgid "calc_blklen: returned %d as best\n"
 msgstr "calc_blklen: liefert %d als besten Wert\n"
 
-#: src/lsz.c:2489
+#: src/lsz.c:2486
 #, c-format
 msgid ""
 "\n"
@@ -493,32 +489,32 @@ msgstr ""
 "\n"
 "countem: Gesamt %d %ld\n"
 
-#: src/zm.c:244
+#: src/zm.c:245
 #, c-format
 msgid "Bad escape sequence %x"
 msgstr "Falsche Escapesequenz %x"
 
-#: src/zm.c:582 src/zm.c:641
+#: src/zm.c:583 src/zm.c:642
 msgid "Sender Canceled"
 msgstr "Sender brach ab"
 
-#: src/lrz.c:997 src/zm.c:585 src/zm.c:644
+#: src/lrz.c:1002 src/zm.c:586 src/zm.c:645
 msgid "TIMEOUT"
 msgstr "TIMEOUT"
 
-#: src/zm.c:588 src/zm.c:647
+#: src/zm.c:589 src/zm.c:648
 msgid "Bad data subpacket"
 msgstr "Falsches Unterpaket"
 
-#: src/zm.c:595 src/zm.c:654
+#: src/zm.c:596 src/zm.c:655
 msgid "Data subpacket too long"
 msgstr "Datenunterpaket zu lang"
 
-#: src/zm.c:711
+#: src/zm.c:712
 msgid "Garbage count exceeded"
 msgstr "Maximale Wiederholungsanzahl überschritten"
 
-#: src/zm.c:772
+#: src/zm.c:773
 #, c-format
 msgid "Got %s"
 msgstr "Erhielt %s"
@@ -528,41 +524,40 @@ msgstr "Erhielt %s"
 msgid "Retry %d: "
 msgstr "Wiederholungsversuch %d: "
 
-#: src/lrz.c:387
+#: src/lrz.c:382
 msgid "don't have settimeofday, will not set time\n"
 msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n"
 
-#: src/lrz.c:391
+#: src/lrz.c:386
 msgid "not running as root (this is good!), can not set time\n"
 msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n"
 
-#: src/lrz.c:446
+#: src/lrz.c:441
 msgid "bytes_per_error"
 msgstr "Bytes-pro-Fehler"
 
-#: src/lrz.c:448
+#: src/lrz.c:443
 msgid "bytes-per-error should be >100"
 msgstr "Bytes-pro-Fehler muss >100 sein"
 
-#: src/lrz.c:460
+#: src/lrz.c:455
 msgid "O_SYNC not supported by the kernel"
 msgstr "O_SYNC vom Kernel nicht unterstützt"
 
-#: src/lrz.c:494 src/lrz.c:496
+#: src/lrz.c:497 src/lrz.c:499
 msgid "garbage on commandline"
 msgstr "Müll auf der Kommandozeile"
 
-#: src/lrz.c:601
+#: src/lrz.c:604
 #, c-format
 msgid "Usage: %s [options] [filename.if.xmodem]\n"
 msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n"
 
-#: src/lrz.c:602
+#: src/lrz.c:605
 msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n"
 msgstr "Dateien mit ZMODEM/YMODEM/XMODEM-Protokoll empfangen\n"
 
-#: src/lrz.c:609
-#, fuzzy
+#: src/lrz.c:612
 msgid ""
 "  -+, --append                append to existing files\n"
 "  -a, --ascii                 ASCII transfer (change CR/LF to LF)\n"
@@ -588,6 +583,8 @@ msgid ""
 "  -S, --timesync              request remote time (twice: set local time)\n"
 "      --syslog[=off]          turn syslog on or off, if possible\n"
 "  -t, --timeout N             set timeout to N tenths of a second\n"
+"      --tcp-server            open socket, wait for connection (Z)\n"
+"      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n"
 "  -u, --keep-uppercase        keep upper case filenames\n"
 "  -U, --unrestrict            disable restricted mode (if allowed to)\n"
 "  -v, --verbose               be verbose, provide debugging information\n"
@@ -624,6 +621,8 @@ msgstr ""
 "  -S, --timesync              Zeit anfordern (doppelt: lokale Zeit setzen)\n"
 "      --syslog[=off]          syslog an- oder ausschalten, wenn möglich\n"
 "  -t, --timeout N             Timeout auf N Zehntelsekungen setzen\n"
+"      --tcp-server            Socket öffnen und auf Verbindung warten\n"
+"      --tcp-client ADDR:PORT  Socket öffnen und verbindung mit ...\n"
 "  -u, --keep-uppercase        GROSS geschrieben Dateinamen beibehalten\n"
 "  -U, --unrestrict            eingeschränkten Modus aufheben (falls "
 "erlaubt)\n"
@@ -636,27 +635,27 @@ msgstr ""
 "\n"
 "Kurze Optionen benötigen dieselben Argumente wie Lange.\n"
 
-#: src/lrz.c:671
+#: src/lrz.c:676
 #, c-format
 msgid "%s waiting to receive."
 msgstr "%s wartet auf Sender."
 
-#: src/lrz.c:725 src/lrz.c:1821
+#: src/lrz.c:730 src/lrz.c:1806
 #, c-format
 msgid "\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n"
 msgstr "\rBytes empfangen:%7ld/%7ld   BPS:%-8ld                \r\n"
 
-#: src/lrz.c:767
+#: src/lrz.c:772
 #, c-format
 msgid "%s: ready to receive %s"
 msgstr "%s: bereit zum Empfangen von %s"
 
-#: src/lrz.c:794
+#: src/lrz.c:799
 #, c-format
 msgid "\rBytes received: %7ld   BPS:%-6ld                \r\n"
 msgstr "\rBytes empfangen: %7ld   BPS:%-6ld                \r\n"
 
-#: src/lrz.c:820
+#: src/lrz.c:825
 #, c-format
 msgid ""
 "\r\n"
@@ -665,137 +664,138 @@ msgstr ""
 "\r\n"
 "%s: %s gelöscht\r\n"
 
-#: src/lrz.c:851
+#: src/lrz.c:856
 msgid "Pathname fetch returned EOT"
 msgstr "Ende der Übertragung beim Warten auf Dateinamen"
 
-#: src/lrz.c:898
+#: src/lrz.c:903
 msgid "Received dup Sector"
 msgstr "Sektor doppelt empfangen"
 
-#: src/lrz.c:912
+#: src/lrz.c:917
 msgid "Sync Error"
 msgstr "Synchronisationsfehler"
 
-#: src/lrz.c:960
+#: src/lrz.c:965
 msgid "CRC"
 msgstr "CRC-Fehler"
 
-#: src/lrz.c:971
+#: src/lrz.c:976
 msgid "Checksum"
 msgstr "Prüfsummenfehler"
 
-#: src/lrz.c:974
+#: src/lrz.c:979
 msgid "Sector number garbled"
 msgstr "Sektorennummer fehlerhaft"
 
-#: src/lrz.c:986
+#: src/lrz.c:991
 msgid "Sender Cancelled"
 msgstr "Sender brach ab"
 
-#: src/lrz.c:1000
+#: src/lrz.c:1005
 #, c-format
 msgid "Got 0%o sector header"
 msgstr "Erhielt %02x als Sektorbestätigung"
 
-#: src/lrz.c:1108
+#: src/lrz.c:1113
 #, c-format
 msgid "file name ends with a /, skipped: %s\n"
 msgstr "Dateiname endet mit /, übersprungen: %s\n"
 
-#: src/lrz.c:1122
+#: src/lrz.c:1127
 #, c-format
 msgid "zmanag=%d, Lzmanag=%d\n"
 msgstr ""
 
-#: src/lrz.c:1123
+#: src/lrz.c:1128
 #, c-format
 msgid "zconv=%d\n"
 msgstr ""
 
-#: src/lrz.c:1191 src/lrz.c:1225
+#: src/lrz.c:1192 src/lrz.c:1226
 #, c-format
 msgid "file exists, skipped: %s\n"
 msgstr "Datei existiert, übersprungen: %s\n"
 
-#: src/lrz.c:1266
+#: src/lrz.c:1267
 #, c-format
 msgid "TIMESYNC: here %ld, remote %ld, diff %ld seconds\n"
 msgstr "Zeitsynchronisation: hier %ld, dort %ld, Unterschied %ld Sekunden\n"
 
-#: src/lrz.c:1275
+#: src/lrz.c:1276
 #, c-format
 msgid "TIMESYNC: cannot set time: %s\n"
 msgstr "Zeitsynchronisation: kann Zeit nicht setzen: %s\n"
 
-#: src/lrz.c:1285
-msgid "cannot tmpfile() for tcp protocol synchronization"
-msgstr "tmpfile() zur tcp Protokoll Synchronisation fehlgeschlagen"
-
-#: src/lrz.c:1304
+#: src/lrz.c:1296
 msgid "Topipe"
 msgstr "Pipe zu"
 
-#: src/lrz.c:1322
+#: src/lrz.c:1314
 #, c-format
 msgid "Receiving: %s\n"
 msgstr "Empfange: %s\n"
 
-#: src/lrz.c:1553
+#: src/lrz.c:1545
 #, c-format
 msgid "Blocks received: %d"
 msgstr "Blöcke empfangen: %d"
 
-#: src/lrz.c:1607
+#: src/lrz.c:1599
 #, c-format
 msgid "%s: %s exists\n"
 msgstr "%s: %s existiert bereits\n"
 
-#: src/lrz.c:1620 src/lrz.c:1628
+#: src/lrz.c:1612 src/lrz.c:1620
 #, c-format
 msgid "%s:\tSecurity Violation"
 msgstr "%s:\tSicherheitsverstoß"
 
-#: src/lrz.c:1745
+#: src/lrz.c:1730
 msgid "remote command execution requested"
 msgstr "Gegenseite versucht Kommandoausführung"
 
-#: src/lrz.c:1752
+#: src/lrz.c:1737
 msgid "not executed"
 msgstr "nicht ausgeführt"
 
-#: src/lrz.c:1783
+#: src/lrz.c:1768
 msgid "got ZRINIT"
 msgstr "Erhielt unerwartetes ZRINIT"
 
-#: src/lrz.c:1832
+#: src/lrz.c:1817
 msgid "Skipped"
 msgstr "Übersprungen"
 
 #. too bad
-#: src/lrz.c:2064
+#: src/lrz.c:2049
 #, c-format
 msgid "rzfile: bps rate %ld below min %ld"
 msgstr "rzfile: BPS-Rate %ld unter Minimum %ld"
 
 #. too bad
-#: src/lrz.c:2079
+#: src/lrz.c:2064
 msgid "rzfile: reached stop time"
 msgstr "rzfile: Abbruchzeit erreicht"
 
-#: src/lrz.c:2086
+#: src/lrz.c:2071
 #, c-format
 msgid "\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  "
 msgstr "\rBytes empfangen:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  "
 
-#: src/lrz.c:2231
-msgid "fgets for tcp protocol synchronization failed: "
-msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: "
-
-#: src/lrz.c:2238
+#: src/lrz.c:2215
 msgid "file close error"
 msgstr "Fehler beim Schließen der Datei"
 
+#~ msgid "tcp protocol init failed\n"
+#~ msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n"
+
+#~ msgid "cannot tmpfile() for tcp protocol synchronization"
+#~ msgstr "tmpfile() zur tcp Protokoll Synchronisation fehlgeschlagen"
+
+#~ msgid "fgets for tcp protocol synchronization failed: "
+#~ msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: "
+
 #~ msgid "Transfer complete."
 #~ msgstr "Übertragung abgeschlossen"
 
diff --git a/po/lrzsz.pot b/po/lrzsz.pot
index 2c3cfcf..3863e66 100644
--- a/po/lrzsz.pot
+++ b/po/lrzsz.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-30 08:49+0100\n"
+"POT-Creation-Date: 1999-08-22 21:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "io_mode(,2) in rbsb.c not implemented\n"
 msgstr ""
 
-#: src/lrz.c:201 src/lsz.c:230
+#: src/lrz.c:196 src/lsz.c:230
 #, c-format
 msgid "caught signal %d; exiting"
 msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
 msgid "framelength out of range 32..%ld"
 msgstr ""
 
-#: src/lrz.c:323 src/lsz.c:450
+#: src/lrz.c:318 src/lsz.c:450
 msgid "min_bps"
 msgstr ""
 
@@ -53,275 +53,272 @@ msgstr ""
 msgid "min_bps must be >= 0"
 msgstr ""
 
-#: src/lrz.c:329 src/lsz.c:458
+#: src/lrz.c:324 src/lsz.c:458
 msgid "min_bps_time"
 msgstr ""
 
-#: src/lrz.c:331 src/lsz.c:460
+#: src/lrz.c:326 src/lsz.c:460
 msgid "min_bps_time must be > 1"
 msgstr ""
 
-#: src/lrz.c:347 src/lsz.c:484
+#: src/lrz.c:342 src/lsz.c:484
 msgid "hour to large (0..23)"
 msgstr ""
 
-#: src/lrz.c:349 src/lsz.c:486
+#: src/lrz.c:344 src/lsz.c:486
 msgid "unparsable stop time\n"
 msgstr ""
 
-#: src/lrz.c:353 src/lsz.c:490
+#: src/lrz.c:348 src/lsz.c:490
 msgid "minute to large (0..59)"
 msgstr ""
 
-#: src/lrz.c:363 src/lrz.c:370 src/lsz.c:500 src/lsz.c:507
+#: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507
 msgid "stop time to small"
 msgstr ""
 
-#: src/lrz.c:368 src/lsz.c:505
+#: src/lrz.c:363 src/lsz.c:505
 msgid "stop-at"
 msgstr ""
 
-#: src/lrz.c:399 src/lsz.c:516
+#: src/lrz.c:394 src/lsz.c:516
 msgid "timeout"
 msgstr ""
 
-#: src/lrz.c:401 src/lsz.c:518
+#: src/lrz.c:396 src/lsz.c:518
 msgid "timeout out of range 10..1000"
 msgstr ""
 
-#: src/lrz.c:417 src/lsz.c:526
+#: src/lrz.c:412 src/lsz.c:526
 msgid "security violation: can't do that under restricted shell\n"
 msgstr ""
 
-#: src/lrz.c:407 src/lsz.c:533
+#: src/lrz.c:402 src/lsz.c:533
 msgid "window size"
 msgstr ""
 
-#: src/lrz.c:432 src/lrz.c:439 src/lsz.c:556 src/lsz.c:563
+#: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563
 msgid "cannot turnoff syslog"
 msgstr ""
 
-#: src/lrz.c:454 src/lsz.c:571
+#: src/lrz.c:449 src/lsz.c:571
 msgid "startup delay"
 msgstr ""
 
-#: src/lrz.c:470 src/lrz.c:755 src/lrz.c:1117 src/lrz.c:1243 src/lrz.c:1300
-#: src/lrz.c:1317 src/lrz.c:1332 src/lrz.c:1431 src/lsz.c:583 src/lsz.c:692
-#: src/lsz.c:831 src/lsz.c:1080 src/zreadline.c:127
+#: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244
+#: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580
+#: src/lsz.c:596 src/lsz.c:693 src/lsz.c:828 src/lsz.c:1061
+#: src/zreadline.c:127
 msgid "out of memory"
 msgstr ""
 
-#: src/lrz.c:480 src/lsz.c:595
+#: src/lrz.c:475 src/lsz.c:592
 msgid "this program was never intended to be used setuid\n"
 msgstr ""
 
-#: src/lsz.c:611 src/lsz.c:626
+#: src/lsz.c:612 src/lsz.c:627
 msgid "need at least one file to send"
 msgstr ""
 
-#: src/lsz.c:628
+#: src/lsz.c:629
 msgid "Can't send command in restricted mode\n"
 msgstr ""
 
-#: src/lrz.c:524 src/lsz.c:655
+#: src/lrz.c:527 src/lsz.c:656
 msgid "hostname too long\n"
 msgstr ""
 
-#: src/lrz.c:539 src/lsz.c:670
+#: src/lrz.c:542 src/lsz.c:671
 msgid "illegal server address\n"
 msgstr ""
 
-#: src/lsz.c:709
+#: src/lsz.c:710
 msgid "can read only one file from stdin"
 msgstr ""
 
-#: src/lrz.c:571 src/lsz.c:806
+#: src/lrz.c:574 src/lsz.c:803
 msgid "Transfer incomplete\n"
 msgstr ""
 
-#: src/lrz.c:573 src/lsz.c:808
+#: src/lrz.c:576 src/lsz.c:805
 msgid "Transfer complete\n"
 msgstr ""
 
-#: src/lsz.c:841
+#: src/lsz.c:838
 #, c-format
 msgid "send_pseudo %s: cannot open tmpfile %s: %s"
 msgstr ""
 
-#: src/lsz.c:854
+#: src/lsz.c:851
 #, c-format
 msgid "send_pseudo %s: cannot lstat tmpfile %s: %s"
 msgstr ""
 
-#: src/lsz.c:862
+#: src/lsz.c:859
 #, c-format
 msgid "send_pseudo %s: avoiding symlink trap"
 msgstr ""
 
-#: src/lsz.c:873
+#: src/lsz.c:870
 #, c-format
 msgid "send_pseudo %s: cannot write to tmpfile %s: %s"
 msgstr ""
 
-#: src/lsz.c:882
+#: src/lsz.c:879
 #, c-format
 msgid "send_pseudo %s: failed"
 msgstr ""
 
-#: src/lsz.c:885
+#: src/lsz.c:882
 #, c-format
 msgid "send_pseudo %s: ok"
 msgstr ""
 
-#: src/lsz.c:912
-msgid "tcp protocol init failed\n"
-msgstr ""
-
-#: src/lsz.c:935
+#: src/lsz.c:916
 #, c-format
 msgid "Answering TIMESYNC at %s"
 msgstr ""
 
-#: src/lsz.c:940
+#: src/lsz.c:921
 msgid "timezone"
 msgstr ""
 
-#: src/lsz.c:943
+#: src/lsz.c:924
 msgid "timezone unknown"
 msgstr ""
 
-#: src/lsz.c:972
+#: src/lsz.c:953
 msgid "Can't open any requested files."
 msgstr ""
 
-#: src/lsz.c:1028
+#: src/lsz.c:1009
 #, c-format
 msgid "security violation: not allowed to upload from %s"
 msgstr ""
 
-#: src/lrz.c:1392 src/lsz.c:1046
+#: src/lrz.c:1384 src/lsz.c:1027
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: src/lsz.c:1101
+#: src/lsz.c:1082
 #, c-format
 msgid "is not a file: %s"
 msgstr ""
 
-#: src/lsz.c:1134 src/lsz.c:1149
+#: src/lsz.c:1115 src/lsz.c:1130
 #, c-format
 msgid "%s/%s: error occured"
 msgstr ""
 
-#: src/lsz.c:1138
+#: src/lsz.c:1119
 #, c-format
 msgid "skipped: %s"
 msgstr ""
 
-#: src/lsz.c:1141
+#: src/lsz.c:1122
 #, c-format
 msgid "%s/%s: skipped"
 msgstr ""
 
-#: src/lsz.c:1168
+#: src/lsz.c:1149
 #, c-format
 msgid "Bytes Sent:%7ld   BPS:%-8ld                        \n"
 msgstr ""
 
-#: src/lsz.c:1197
+#: src/lsz.c:1178
 #, c-format
 msgid "Sending %s, %ld blocks: "
 msgstr ""
 
-#: src/lsz.c:1200
+#: src/lsz.c:1181
 msgid "Give your local XMODEM receive command now."
 msgstr ""
 
-#: src/lsz.c:1243
+#: src/lsz.c:1224
 #, c-format
 msgid "Sending: %s\n"
 msgstr ""
 
-#: src/lsz.c:1286
+#: src/lsz.c:1267
 msgid "Timeout on pathname"
 msgstr ""
 
-#: src/lsz.c:1333
+#: src/lsz.c:1314
 msgid "Receiver Cancelled"
 msgstr ""
 
-#: src/lsz.c:1359
+#: src/lsz.c:1340
 msgid "No ACK on EOT"
 msgstr ""
 
-#: src/lsz.c:1380
+#: src/lsz.c:1361
 #, c-format
 msgid "Xmodem sectors/kbytes sent: %3d/%2dk"
 msgstr ""
 
-#: src/lsz.c:1382
+#: src/lsz.c:1363
 #, c-format
 msgid "Ymodem sectors/kbytes sent: %3d/%2dk"
 msgstr ""
 
-#: src/lsz.c:1414
+#: src/lsz.c:1395
 msgid "Cancelled"
 msgstr ""
 
-#: src/lsz.c:1418
+#: src/lsz.c:1399
 msgid "Timeout on sector ACK"
 msgstr ""
 
-#: src/lsz.c:1423
+#: src/lsz.c:1404
 msgid "NAK on sector"
 msgstr ""
 
-#: src/lsz.c:1429
+#: src/lsz.c:1410
 msgid "Got burst for sector ACK"
 msgstr ""
 
-#: src/lsz.c:1431
+#: src/lsz.c:1412
 #, c-format
 msgid "Got %02x for sector ACK"
 msgstr ""
 
-#: src/lsz.c:1443
+#: src/lsz.c:1424
 msgid "Retry Count Exceeded"
 msgstr ""
 
-#: src/lrz.c:593 src/lsz.c:1521
+#: src/lrz.c:596 src/lsz.c:1502
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/lrz.c:598 src/lsz.c:1526
+#: src/lrz.c:601 src/lsz.c:1507
 #, c-format
 msgid "%s version %s\n"
 msgstr ""
 
-#: src/lsz.c:1529
+#: src/lsz.c:1510
 #, c-format
 msgid "Usage: %s [options] file ...\n"
 msgstr ""
 
-#: src/lsz.c:1531
+#: src/lsz.c:1512
 #, c-format
 msgid "   or: %s [options] -{c|i} COMMAND\n"
 msgstr ""
 
-#: src/lsz.c:1532
+#: src/lsz.c:1513
 msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n"
 msgstr ""
 
-#: src/lrz.c:604 src/lsz.c:1534
+#: src/lrz.c:607 src/lsz.c:1515
 msgid ""
 "    (X) = option applies to XMODEM only\n"
 "    (Y) = option applies to YMODEM only\n"
 "    (Z) = option applies to ZMODEM only\n"
 msgstr ""
 
-#: src/lsz.c:1540
+#: src/lsz.c:1521
 msgid ""
 "  -+, --append                append to existing destination file (Z)\n"
 "  -2, --twostop               use 2 stop bits\n"
@@ -348,7 +345,7 @@ msgid ""
 "  -M, --min-bps-time N          for at least N seconds (default: 120)\n"
 msgstr ""
 
-#: src/lsz.c:1565
+#: src/lsz.c:1546
 msgid ""
 "  -n, --newer                 send file if source newer (Z)\n"
 "  -N, --newer-or-longer       send file if source newer or longer (Z)\n"
@@ -359,8 +356,8 @@ msgid ""
 "  -R, --restricted            restricted, more secure mode\n"
 "  -q, --quiet                 quiet (no progress reports)\n"
 "  -s, --stop-at {HH:MM|+N}    stop transmission at HH:MM or in N seconds\n"
-"      --tcp                   build a TCP connection to transmit files\n"
-"      --tcp-server            open socket, wait for connection\n"
+"      --tcp-server            open socket, wait for connection (Z)\n"
+"      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n"
 "  -u, --unlink                unlink file after transmission\n"
 "  -U, --unrestrict            turn off restricted mode (if allowed to)\n"
 "  -v, --verbose               be verbose, provide debugging information\n"
@@ -374,96 +371,96 @@ msgid ""
 "short options use the same arguments as the long ones\n"
 msgstr ""
 
-#: src/lsz.c:1786
+#: src/lsz.c:1768
 msgid "got ZRQINIT"
 msgstr ""
 
-#: src/lrz.c:1074 src/lrz.c:1787 src/lsz.c:1792
+#: src/lrz.c:1079 src/lrz.c:1772 src/lsz.c:1774
 msgid "got ZCAN"
 msgstr ""
 
-#: src/lsz.c:2000
+#: src/lsz.c:1991
 #, c-format
 msgid "blklen now %d\n"
 msgstr ""
 
-#: src/lsz.c:2062
+#: src/lsz.c:2053
 #, c-format
 msgid "zsendfdata: bps rate %ld below min %ld"
 msgstr ""
 
-#: src/lsz.c:2079
+#: src/lsz.c:2070
 msgid "zsendfdata: reached stop time"
 msgstr ""
 
-#: src/lsz.c:2089
+#: src/lsz.c:2080
 #, c-format
 msgid "Bytes Sent:%7ld/%7ld   BPS:%-8ld ETA %02d:%02d  "
 msgstr ""
 
-#: src/lsz.c:2228
+#: src/lsz.c:2223
 #, c-format
 msgid "calc_blklen: reduced to %d due to error\n"
 msgstr ""
 
-#: src/lsz.c:2261
+#: src/lsz.c:2256
 #, c-format
 msgid "calc_blklen: returned old value %d due to low bpe diff\n"
 msgstr ""
 
-#: src/lsz.c:2263
+#: src/lsz.c:2258
 #, c-format
 msgid "calc_blklen: old %ld, new %ld, d %ld\n"
 msgstr ""
 
-#: src/lsz.c:2272
+#: src/lsz.c:2267
 #, c-format
 msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n"
 msgstr ""
 
-#: src/lsz.c:2283
+#: src/lsz.c:2278
 #, c-format
 msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n"
 msgstr ""
 
-#: src/lsz.c:2295
+#: src/lsz.c:2290
 #, c-format
 msgid "calc_blklen: returned %d as best\n"
 msgstr ""
 
-#: src/lsz.c:2489
+#: src/lsz.c:2486
 #, c-format
 msgid ""
 "\n"
 "countem: Total %d %ld\n"
 msgstr ""
 
-#: src/zm.c:244
+#: src/zm.c:245
 #, c-format
 msgid "Bad escape sequence %x"
 msgstr ""
 
-#: src/zm.c:582 src/zm.c:641
+#: src/zm.c:583 src/zm.c:642
 msgid "Sender Canceled"
 msgstr ""
 
-#: src/lrz.c:997 src/zm.c:585 src/zm.c:644
+#: src/lrz.c:1002 src/zm.c:586 src/zm.c:645
 msgid "TIMEOUT"
 msgstr ""
 
-#: src/zm.c:588 src/zm.c:647
+#: src/zm.c:589 src/zm.c:648
 msgid "Bad data subpacket"
 msgstr ""
 
-#: src/zm.c:595 src/zm.c:654
+#: src/zm.c:596 src/zm.c:655
 msgid "Data subpacket too long"
 msgstr ""
 
-#: src/zm.c:711
+#: src/zm.c:712
 msgid "Garbage count exceeded"
 msgstr ""
 
-#: src/zm.c:772
+#: src/zm.c:773
 #, c-format
 msgid "Got %s"
 msgstr ""
@@ -473,40 +470,40 @@ msgstr ""
 msgid "Retry %d: "
 msgstr ""
 
-#: src/lrz.c:387
+#: src/lrz.c:382
 msgid "don't have settimeofday, will not set time\n"
 msgstr ""
 
-#: src/lrz.c:391
+#: src/lrz.c:386
 msgid "not running as root (this is good!), can not set time\n"
 msgstr ""
 
-#: src/lrz.c:446
+#: src/lrz.c:441
 msgid "bytes_per_error"
 msgstr ""
 
-#: src/lrz.c:448
+#: src/lrz.c:443
 msgid "bytes-per-error should be >100"
 msgstr ""
 
-#: src/lrz.c:460
+#: src/lrz.c:455
 msgid "O_SYNC not supported by the kernel"
 msgstr ""
 
-#: src/lrz.c:494 src/lrz.c:496
+#: src/lrz.c:497 src/lrz.c:499
 msgid "garbage on commandline"
 msgstr ""
 
-#: src/lrz.c:601
+#: src/lrz.c:604
 #, c-format
 msgid "Usage: %s [options] [filename.if.xmodem]\n"
 msgstr ""
 
-#: src/lrz.c:602
+#: src/lrz.c:605
 msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n"
 msgstr ""
 
-#: src/lrz.c:609
+#: src/lrz.c:612
 msgid ""
 "  -+, --append                append to existing files\n"
 "  -a, --ascii                 ASCII transfer (change CR/LF to LF)\n"
@@ -532,6 +529,8 @@ msgid ""
 "  -S, --timesync              request remote time (twice: set local time)\n"
 "      --syslog[=off]          turn syslog on or off, if possible\n"
 "  -t, --timeout N             set timeout to N tenths of a second\n"
+"      --tcp-server            open socket, wait for connection (Z)\n"
+"      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n"
 "  -u, --keep-uppercase        keep upper case filenames\n"
 "  -U, --unrestrict            disable restricted mode (if allowed to)\n"
 "  -v, --verbose               be verbose, provide debugging information\n"
@@ -544,160 +543,152 @@ msgid ""
 "short options use the same arguments as the long ones\n"
 msgstr ""
 
-#: src/lrz.c:671
+#: src/lrz.c:676
 #, c-format
 msgid "%s waiting to receive."
 msgstr ""
 
-#: src/lrz.c:725 src/lrz.c:1821
+#: src/lrz.c:730 src/lrz.c:1806
 #, c-format
 msgid "\rBytes received: %7ld/%7ld   BPS:%-6ld                \r\n"
 msgstr ""
 
-#: src/lrz.c:767
+#: src/lrz.c:772
 #, c-format
 msgid "%s: ready to receive %s"
 msgstr ""
 
-#: src/lrz.c:794
+#: src/lrz.c:799
 #, c-format
 msgid "\rBytes received: %7ld   BPS:%-6ld                \r\n"
 msgstr ""
 
-#: src/lrz.c:820
+#: src/lrz.c:825
 #, c-format
 msgid ""
 "\r\n"
 "%s: %s removed.\r\n"
 msgstr ""
 
-#: src/lrz.c:851
+#: src/lrz.c:856
 msgid "Pathname fetch returned EOT"
 msgstr ""
 
-#: src/lrz.c:898
+#: src/lrz.c:903
 msgid "Received dup Sector"
 msgstr ""
 
-#: src/lrz.c:912
+#: src/lrz.c:917
 msgid "Sync Error"
 msgstr ""
 
-#: src/lrz.c:960
+#: src/lrz.c:965
 msgid "CRC"
 msgstr ""
 
-#: src/lrz.c:971
+#: src/lrz.c:976
 msgid "Checksum"
 msgstr ""
 
-#: src/lrz.c:974
+#: src/lrz.c:979
 msgid "Sector number garbled"
 msgstr ""
 
-#: src/lrz.c:986
+#: src/lrz.c:991
 msgid "Sender Cancelled"
 msgstr ""
 
-#: src/lrz.c:1000
+#: src/lrz.c:1005
 #, c-format
 msgid "Got 0%o sector header"
 msgstr ""
 
-#: src/lrz.c:1108
+#: src/lrz.c:1113
 #, c-format
 msgid "file name ends with a /, skipped: %s\n"
 msgstr ""
 
-#: src/lrz.c:1122
+#: src/lrz.c:1127
 #, c-format
 msgid "zmanag=%d, Lzmanag=%d\n"
 msgstr ""
 
-#: src/lrz.c:1123
+#: src/lrz.c:1128
 #, c-format
 msgid "zconv=%d\n"
 msgstr ""
 
-#: src/lrz.c:1191 src/lrz.c:1225
+#: src/lrz.c:1192 src/lrz.c:1226
 #, c-format
 msgid "file exists, skipped: %s\n"
 msgstr ""
 
-#: src/lrz.c:1266
+#: src/lrz.c:1267
 #, c-format
 msgid "TIMESYNC: here %ld, remote %ld, diff %ld seconds\n"
 msgstr ""
 
-#: src/lrz.c:1275
+#: src/lrz.c:1276
 #, c-format
 msgid "TIMESYNC: cannot set time: %s\n"
 msgstr ""
 
-#: src/lrz.c:1285
-msgid "cannot tmpfile() for tcp protocol synchronization"
-msgstr ""
-
-#: src/lrz.c:1304
+#: src/lrz.c:1296
 msgid "Topipe"
 msgstr ""
 
-#: src/lrz.c:1322
+#: src/lrz.c:1314
 #, c-format
 msgid "Receiving: %s\n"
 msgstr ""
 
-#: src/lrz.c:1553
+#: src/lrz.c:1545
 #, c-format
 msgid "Blocks received: %d"
 msgstr ""
 
-#: src/lrz.c:1607
+#: src/lrz.c:1599
 #, c-format
 msgid "%s: %s exists\n"
 msgstr ""
 
-#: src/lrz.c:1620 src/lrz.c:1628
+#: src/lrz.c:1612 src/lrz.c:1620
 #, c-format
 msgid "%s:\tSecurity Violation"
 msgstr ""
 
-#: src/lrz.c:1745
+#: src/lrz.c:1730
 msgid "remote command execution requested"
 msgstr ""
 
-#: src/lrz.c:1752
+#: src/lrz.c:1737
 msgid "not executed"
 msgstr ""
 
-#: src/lrz.c:1783
+#: src/lrz.c:1768
 msgid "got ZRINIT"
 msgstr ""
 
-#: src/lrz.c:1832
+#: src/lrz.c:1817
 msgid "Skipped"
 msgstr ""
 
 #. too bad
-#: src/lrz.c:2064
+#: src/lrz.c:2049
 #, c-format
 msgid "rzfile: bps rate %ld below min %ld"
 msgstr ""
 
 #. too bad
-#: src/lrz.c:2079
+#: src/lrz.c:2064
 msgid "rzfile: reached stop time"
 msgstr ""
 
-#: src/lrz.c:2086
+#: src/lrz.c:2071
 #, c-format
 msgid "\rBytes received: %7ld/%7ld   BPS:%-6ld ETA %02d:%02d  "
 msgstr ""
 
-#: src/lrz.c:2231
-msgid "fgets for tcp protocol synchronization failed: "
-msgstr ""
-
-#: src/lrz.c:2238
+#: src/lrz.c:2215
 msgid "file close error"
 msgstr ""
diff --git a/src/Makefile.in b/src/Makefile.in
index d7846b6..012fc7f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -31,7 +31,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -48,6 +48,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -89,17 +90,17 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-bin_PROGRAMS=lrz lsz
-lrz_SOURCES=lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
-lsz_SOURCES=lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
+bin_PROGRAMS = lrz lsz
+lrz_SOURCES = lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
+lsz_SOURCES = lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
 noinst_HEADERS = timing.h zglobal.h zmodem.h
 datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
-CFLAGS=@CFLAGS@
-DISTCLEAN_FILES=lrzszbug
+CFLAGS = @CFLAGS@
+DISTCLEAN_FILES = lrzszbug
 
 LDADD = ../lib/libzmodem.a @INTLLIBS@
-AUTOMAKE_OPTIONS=ansi2knr
+AUTOMAKE_OPTIONS = ansi2knr
 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
@@ -121,8 +122,9 @@ rbsb$U.o zm$U.o protname$U.o tcp$U.o lsyslog$U.o canit$U.o
 lsz_LDADD = $(LDADD)
 lsz_DEPENDENCIES =  ../lib/libzmodem.a
 lsz_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in ansi2knr.1 ansi2knr.c lrzszbug.in
@@ -130,16 +132,15 @@ DIST_COMMON =  Makefile.am Makefile.in ansi2knr.1 ansi2knr.c lrzszbug.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
-GZIP = --best
+TAR = gtar
+GZIP_ENV = --best
 SOURCES = $(lrz_SOURCES) $(lsz_SOURCES)
 OBJECTS = $(lrz_OBJECTS) $(lsz_OBJECTS)
 
-all: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS)
-
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -147,7 +148,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 lrzszbug: $(top_builddir)/config.status lrzszbug.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-binPROGRAMS:
 
@@ -163,15 +164,15 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
 .c.o:
@@ -223,37 +224,41 @@ lsz: $(lsz_OBJECTS) $(lsz_DEPENDENCIES)
 	@rm -f lsz
 	$(LINK) $(lsz_LDFLAGS) $(lsz_OBJECTS) $(lsz_LDADD) $(LIBS)
 canit_.c: canit.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/canit.c; then echo $(srcdir)/canit.c; else echo canit.c; fi` | $(ANSI2KNR) canit_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/canit.c; then echo $(srcdir)/canit.c; else echo canit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > canit_.c
 crctab_.c: crctab.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/crctab.c; then echo $(srcdir)/crctab.c; else echo crctab.c; fi` | $(ANSI2KNR) crctab_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/crctab.c; then echo $(srcdir)/crctab.c; else echo crctab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > crctab_.c
 lrz_.c: lrz.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/lrz.c; then echo $(srcdir)/lrz.c; else echo lrz.c; fi` | $(ANSI2KNR) lrz_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lrz.c; then echo $(srcdir)/lrz.c; else echo lrz.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lrz_.c
 lsyslog_.c: lsyslog.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/lsyslog.c; then echo $(srcdir)/lsyslog.c; else echo lsyslog.c; fi` | $(ANSI2KNR) lsyslog_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lsyslog.c; then echo $(srcdir)/lsyslog.c; else echo lsyslog.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lsyslog_.c
 lsz_.c: lsz.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/lsz.c; then echo $(srcdir)/lsz.c; else echo lsz.c; fi` | $(ANSI2KNR) lsz_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lsz.c; then echo $(srcdir)/lsz.c; else echo lsz.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lsz_.c
 protname_.c: protname.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/protname.c; then echo $(srcdir)/protname.c; else echo protname.c; fi` | $(ANSI2KNR) protname_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/protname.c; then echo $(srcdir)/protname.c; else echo protname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > protname_.c
 rbsb_.c: rbsb.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/rbsb.c; then echo $(srcdir)/rbsb.c; else echo rbsb.c; fi` | $(ANSI2KNR) rbsb_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rbsb.c; then echo $(srcdir)/rbsb.c; else echo rbsb.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rbsb_.c
 tcp_.c: tcp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/tcp.c; then echo $(srcdir)/tcp.c; else echo tcp.c; fi` | $(ANSI2KNR) tcp_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tcp.c; then echo $(srcdir)/tcp.c; else echo tcp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tcp_.c
 timing_.c: timing.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/timing.c; then echo $(srcdir)/timing.c; else echo timing.c; fi` | $(ANSI2KNR) timing_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/timing.c; then echo $(srcdir)/timing.c; else echo timing.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > timing_.c
 zm_.c: zm.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/zm.c; then echo $(srcdir)/zm.c; else echo zm.c; fi` | $(ANSI2KNR) zm_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/zm.c; then echo $(srcdir)/zm.c; else echo zm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > zm_.c
 zperr_.c: zperr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/zperr.c; then echo $(srcdir)/zperr.c; else echo zperr.c; fi` | $(ANSI2KNR) zperr_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/zperr.c; then echo $(srcdir)/zperr.c; else echo zperr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > zperr_.c
 zreadline_.c: zreadline.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/zreadline.c; then echo $(srcdir)/zreadline.c; else echo zreadline.c; fi` | $(ANSI2KNR) zreadline_.c
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/zreadline.c; then echo $(srcdir)/zreadline.c; else echo zreadline.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > zreadline_.c
 canit_.o crctab_.o lrz_.o lsyslog_.o lsz_.o protname_.o rbsb_.o tcp_.o \
 timing_.o zm_.o zperr_.o zreadline_.o : $(ANSI2KNR)
 
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+	  && mkid -f$$here/ID $$unique $(LISP)
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
@@ -281,90 +286,106 @@ subdir = src
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
-canit.o: canit.c zglobal.h ../config.h zmodem.h ../lib/getopt.h
+canit.o: canit.c zglobal.h ../config.h ../lib/getopt.h zmodem.h
 crctab.o: crctab.c
-lrz.o: lrz.c zglobal.h ../config.h zmodem.h ../lib/getopt.h timing.h \
+lrz.o: lrz.c zglobal.h ../config.h ../lib/getopt.h zmodem.h timing.h \
 	../lib/long-options.h ../lib/xstrtoul.h ../lib/xstrtol.h \
 	../lib/error.h
-lsyslog.o: lsyslog.c ../config.h zglobal.h zmodem.h
-lsz.o: lsz.c zglobal.h ../config.h zmodem.h ../lib/getopt.h timing.h \
+lsyslog.o: lsyslog.c ../config.h zglobal.h ../lib/getopt.h zmodem.h
+lsz.o: lsz.c zglobal.h ../config.h ../lib/getopt.h zmodem.h timing.h \
 	../lib/long-options.h ../lib/xstrtoul.h ../lib/xstrtol.h \
 	../lib/error.h
-protname.o: protname.c zglobal.h ../config.h zmodem.h
-rbsb.o: rbsb.c zglobal.h ../config.h zmodem.h
-tcp.o: tcp.c ../config.h zglobal.h zmodem.h ../lib/error.h
-timing.o: timing.c zglobal.h ../config.h zmodem.h timing.h
-zm.o: zm.c zglobal.h ../config.h zmodem.h
-zperr.o: zperr.c zglobal.h ../config.h zmodem.h
-zreadline.o: zreadline.c zglobal.h ../config.h zmodem.h ../lib/error.h
-
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: install-binPROGRAMS install-exec-local
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-binPROGRAMS uninstall-local
+protname.o: protname.c zglobal.h ../config.h ../lib/getopt.h zmodem.h
+rbsb.o: rbsb.c zglobal.h ../config.h ../lib/getopt.h zmodem.h
+tcp.o: tcp.c ../config.h zglobal.h ../lib/getopt.h zmodem.h \
+	../lib/error.h
+timing.o: timing.c zglobal.h ../config.h ../lib/getopt.h zmodem.h \
+	timing.h
+zm.o: zm.c zglobal.h ../config.h ../lib/getopt.h zmodem.h
+zperr.o: zperr.c zglobal.h ../config.h ../lib/getopt.h zmodem.h
+zreadline.o: zreadline.c zglobal.h ../config.h ../lib/getopt.h zmodem.h \
+	../lib/error.h
 
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am: install-binPROGRAMS install-exec-local
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-binPROGRAMS uninstall-local
+uninstall: uninstall-am
+all-am: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS)
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
-	$(mkinstalldirs)  $(DATADIR)$(bindir)
+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-compile \
+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
 		mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
 		mostlyclean-generic
 
-clean:  clean-binPROGRAMS clean-compile clean-krextra clean-kr \
-		clean-tags clean-generic mostlyclean
+mostlyclean: mostlyclean-am
 
-distclean:  distclean-binPROGRAMS distclean-compile distclean-krextra \
-		distclean-kr distclean-tags distclean-generic clean
-	-rm -f config.status
+clean-am:  clean-binPROGRAMS clean-compile clean-krextra clean-kr \
+		clean-tags clean-generic mostlyclean-am
 
-maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
-		maintainer-clean-krextra maintainer-clean-kr \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean
+clean: clean-am
+
+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-krextra \
+		distclean-kr distclean-tags distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+		maintainer-clean-compile maintainer-clean-krextra \
+		maintainer-clean-kr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
+maintainer-clean: maintainer-clean-am
+
 .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-krextra distclean-krextra \
 clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
 clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-local \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-local uninstall-am uninstall all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
diff --git a/src/lrz.c b/src/lrz.c
index b3cf1d5..2f6a5ad 100644
--- a/src/lrz.c
+++ b/src/lrz.c
@@ -100,23 +100,18 @@ int	under_rsh=FALSE;
 int zmodem_requested=FALSE;
 
 #ifdef SEGMENTS
-int chinseg = 0;	/* Number of characters received in this data seg */
-char secbuf[1+(SEGMENTS+1)*MAX_BLOCK];
-#else
-char secbuf[MAX_BLOCK + 1];
+static int chinseg = 0;	/* Number of characters received in this data seg */
 #endif
+static char *secbuf;
 
 #ifdef ENABLE_TIMESYNC
-int timesync_flag=0;
-int in_timesync=0;
+static int timesync_flag=0;
+static int in_timesync=0;
 #endif
-int in_tcpsync=0;
-int tcpsync_flag=1;
 int tcp_socket=-1;
 int tcp_flag=0;
 char *tcp_server_address=NULL;
 
-char tcp_buf[256]="";
 #if defined(F_GETFD) && defined(F_SETFD) && defined(O_SYNC)
 static int o_sync = 0;
 #endif
@@ -250,7 +245,7 @@ static struct option const long_options[] =
 static void
 show_version(void)
 {
-	printf ("%s (%s) %s\n", program_name, PACKAGE, VERSION);
+	printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
 }
 
 int
@@ -479,6 +474,14 @@ main(int argc, char *argv[])
 		error(1,0,
 		_("this program was never intended to be used setuid\n"));
 	}
+
+#ifdef SEGMENTS
+	secbuf=malloc(1+(SEGMENTS+1)*MAX_BLOCK);
+#else
+	secbuf=malloc(MAX_BLOCK+1);
+#endif
+	if (!secbuf) error(1,0,_("out of memory"));
+
 	/* initialize zsendline tab */
 	zsendline_init();
 #ifdef HAVE_SIGINTERRUPT
@@ -630,6 +633,8 @@ usage(int exitcode, const char *what)
 "  -S, --timesync              request remote time (twice: set local time)\n"
 "      --syslog[=off]          turn syslog on or off, if possible\n"
 "  -t, --timeout N             set timeout to N tenths of a second\n"
+"      --tcp-server            open socket, wait for connection (Z)\n"
+"      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n"
 "  -u, --keep-uppercase        keep upper case filenames\n"
 "  -U, --unrestrict            disable restricted mode (if allowed to)\n"
 "  -v, --verbose               be verbose, provide debugging information\n"
@@ -1148,9 +1153,6 @@ procheader(char *name, struct zm_fileinfo *zi)
 	if (timesync_flag && 0==strcmp(name,"$time$.t"))
 		in_timesync=1;
 #endif
-	in_tcpsync=0;
-	if (tcpsync_flag && 0==strcmp(name,"$tcp$.t"))
-		in_tcpsync=1;
 
 	zi->bytes_total = DEFBYTL;
 	zi->mode = 0; 
@@ -1175,7 +1177,6 @@ procheader(char *name, struct zm_fileinfo *zi)
 		&& (zmanag&ZF1_ZMMASK) != ZF1_ZMAPND
 #ifdef ENABLE_TIMESYNC
 	    && !in_timesync
-	    && !in_tcpsync
 #endif
 		&& (fout=fopen(name, "r"))) {
 		struct stat sta;
@@ -1279,15 +1280,6 @@ procheader(char *name, struct zm_fileinfo *zi)
 		return ERROR; /* skips file */
 	}
 #endif /* ENABLE_TIMESYNC */
-	if (in_tcpsync) {
-		fout=tmpfile();
-		if (!fout) {
-			error(1,errno,_("cannot tmpfile() for tcp protocol synchronization"));
-		}
-		zi->bytes_received=0;
-		return OK;
-	}
-
 
 	if (!zmodem_requested && MakeLCPathname && !IsAnyLower(name_static)
 	  && !(zi->mode&UNIXFILE))
@@ -1671,13 +1663,6 @@ tryz(void)
 			Txhdr[ZF0] |= TESCCTL; /* TESCCTL == ESCCTL */
 		zshhdr(tryzhdrtype, Txhdr);
 
-		if (tcp_socket==-1 && *tcp_buf) {
-			/* we need to switch to tcp mode */
-			tcp_socket=tcp_connect(tcp_buf);
-			tcp_buf[0]=0;
-			dup2(tcp_socket,0);
-			dup2(tcp_socket,1);
-		}
 		if (tryzhdrtype == ZSKIP)	/* Don't skip too far */
 			tryzhdrtype = ZRINIT;	/* CAF 8-21-87 */
 again:
@@ -2225,14 +2210,6 @@ closeit(struct zm_fileinfo *zi)
 		}
 		return OK;
 	}
-	if (in_tcpsync) {
-		rewind(fout);
-		if (!fgets(tcp_buf,sizeof(tcp_buf),fout)) {
-			error(1,errno,_("fgets for tcp protocol synchronization failed: "));
-		}	
-		fclose(fout);
-		return OK;
-	}
 	ret=fclose(fout);
 	if (ret) {
 		zpfatal(_("file close error"));
diff --git a/src/lsz.c b/src/lsz.c
index e9e4660..b9d2545 100644
--- a/src/lsz.c
+++ b/src/lsz.c
@@ -143,7 +143,7 @@ char Myattn[] = { 03, 0336, 0 };
 FILE *input_f;
 
 #define MAX_BLOCK 8192
-char txbuf[MAX_BLOCK];
+char *txbuf;
 
 long vpos = 0;			/* Number of bytes read from file */
 
@@ -190,9 +190,9 @@ size_t max_blklen=1024;
 size_t start_blklen=0;
 int zmodem_requested;
 time_t stop_time=0;
-int tcp_flag=0;
 char *tcp_server_address=0;
 int tcp_socket=-1;
+int tcp_flag=0;
 
 int error_count;
 #define OVERHEAD 18
@@ -235,9 +235,10 @@ bibi (int n)
 
 /* Called when ZMODEM gets an interrupt (^C) */
 static RETSIGTYPE
-onintr(int n LRZSZ_ATTRIB_UNUSED)
+onintr(int n)
 {
 	signal(SIGINT, SIG_IGN);
+	n++; /* use it */
 	longjmp(intrjmp, -1);
 }
 
@@ -296,7 +297,6 @@ static struct option const long_options[] =
   {"overwrite-or-skip", no_argument, NULL, 'Y'},
 
   {"delay-startup", required_argument, NULL, 4},
-  {"tcp", no_argument, NULL, 5},
   {"tcp-server", no_argument, NULL, 6},
   {"tcp-client", required_argument, NULL, 7},
   {"no-unixmode", no_argument, NULL, 8},
@@ -570,9 +570,6 @@ main(int argc, char **argv)
 			if (s_err != LONGINT_OK)
 				STRTOL_FATAL_ERROR (optarg, _("startup delay"), s_err);
 			break;
-		case 5:
-			tcp_flag=1;
-			break;
 		case 6:
 			tcp_flag=2;
 			break;
@@ -594,6 +591,10 @@ main(int argc, char **argv)
 		error(1,0,
 		_("this program was never intended to be used setuid\n"));
 	}
+
+	txbuf=malloc(MAX_BLOCK);
+	if (!txbuf) error(1,0,_("out of memory"));
+
 	zsendline_init();
 
 	if (start_blklen==0) {
@@ -772,10 +773,6 @@ main(int argc, char **argv)
 				Filesleft++;
 			}
 #endif
-			if (tcp_flag==1) {
-				Totalleft+=256; /* tcp never needs more */
-				Filesleft++;
-			}
 		}
 	}
 	fflush(stdout);
@@ -902,22 +899,6 @@ wcsend (int argc, char *argp[])
 	firstsec = TRUE;
 	bytcnt = (size_t) -1;
 
-	if (tcp_flag==1) {
-		char buf[256];
-		int d;
-
-		/* tell receiver to receive via tcp */
-		d=tcp_server(buf);
-		if (send_pseudo("/$tcp$.t",buf)) {
-			error(1,0,_("tcp protocol init failed\n"));
-		}
-		/* ok, now that this file is sent we can switch to tcp */
-
-		tcp_socket=tcp_accept(d);
-		dup2(tcp_socket,0);
-		dup2(tcp_socket,1);
-	}
-
 	for (n = 0; n < argc; ++n) {
 		Totsecs = 0;
 		if (wcs (argp[n],NULL) == ERROR)
@@ -1571,8 +1552,8 @@ usage(int exitcode, const char *what)
 "  -R, --restricted            restricted, more secure mode\n"
 "  -q, --quiet                 quiet (no progress reports)\n"
 "  -s, --stop-at {HH:MM|+N}    stop transmission at HH:MM or in N seconds\n"
-"      --tcp                   build a TCP connection to transmit files\n"
-"      --tcp-server            open socket, wait for connection\n"
+"      --tcp-server            open socket, wait for connection (Z)\n"
+"      --tcp-client ADDR:PORT  open socket, connect to ... (Z)\n"
 "  -u, --unlink                unlink file after transmission\n"
 "  -U, --unrestrict            turn off restricted mode (if allowed to)\n"
 "  -v, --verbose               be verbose, provide debugging information\n"
@@ -1750,7 +1731,6 @@ sendzsinit(void)
 static int 
 zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 {
-	int c;
 	unsigned long crc;
 	size_t rxpos;
 
@@ -1762,6 +1742,8 @@ zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 #endif
 
 	for (;;) {
+		int gotblock;
+		int gotchar;
 		Txhdr[ZF0] = Lzconv;	/* file conversion request */
 		Txhdr[ZF1] = Lzmanag;	/* file management request */
 		if (Lskipnocor)
@@ -1771,11 +1753,11 @@ zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 		zsbhdr(ZFILE, Txhdr);
 		ZSDATA(buf, blen, ZCRCW);
 again:
-		c = zgethdr(Rxhdr, 1, &rxpos);
-		switch (c) {
+		gotblock = zgethdr(Rxhdr, 1, &rxpos);
+		switch (gotblock) {
 		case ZRINIT:
-			while ((c = READLINE_PF(50)) > 0)
-				if (c == ZPAD) {
+			while ((gotchar = READLINE_PF(50)) > 0)
+				if (gotchar == ZPAD) {
 					goto again;
 				}
 			/* **** FALL THRU TO **** */
@@ -1811,7 +1793,8 @@ zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 			if (use_mmap && !mm_addr)
 			{
 				struct stat st;
-				if (fstat (fileno (input_f), &st) == 0) {
+				/* mmap on files of 0 length can give 0 as result .. under linux 2.2.9 at least */
+				if (fstat (fileno (input_f), &st) == 0 && st.st_size!=0) {
 					mm_size = st.st_size;
 					mm_addr = mmap (0, mm_size, PROT_READ,
 									MAP_SHARED, fileno (input_f), 0);
@@ -1842,8 +1825,8 @@ zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 					} else
 						rxpos=-1;
 				}
-				while (rxpos-- && ((c = getc(input_f)) != EOF))
-					crc = UPDC32(c, crc);
+				while (rxpos-- && ((gotchar = getc(input_f)) != EOF))
+					crc = UPDC32(gotchar, crc);
 				crc = ~crc;
 				clearerr(input_f);	/* Clear EOF */
 				fseek(input_f, 0L, 0);
@@ -1852,8 +1835,10 @@ zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 			zsbhdr(ZCRC, Txhdr);
 			goto again;
 		case ZSKIP:
-			if (input_f)
+			if (input_f) {
 				fclose(input_f);
+				input_f=NULL;
+			}
 #ifdef HAVE_MMAP
 			else if (mm_addr) {
 				munmap(mm_addr,mm_size);
@@ -1864,7 +1849,7 @@ zsendfile(struct zm_fileinfo *zi, const char *buf, size_t blen)
 			vfile("receiver skipped");
 			DO_SYSLOG((LOG_INFO, "%s/%s: receiver skipped",
 					   shortname, protname()));
-			return c;
+			return ZSKIP;
 		case ZRPOS:
 			/*
 			 * Suppress zcrcw request otherwise triggered by
@@ -1906,7 +1891,7 @@ zsendfdata (struct zm_fileinfo *zi)
 	if (use_mmap && !mm_addr)
 	{
 		struct stat st;
-		if (fstat (fileno (input_f), &st) == 0) {
+		if (fstat (fileno (input_f), &st) == 0 && st.st_size!=0) {
 			mm_size = st.st_size;
 			mm_addr = mmap (0, mm_size, PROT_READ,
 							MAP_SHARED, fileno (input_f), 0);
@@ -1936,23 +1921,29 @@ zsendfdata (struct zm_fileinfo *zi)
 	  gotack:
 		switch (c) {
 		default:
-			if (input_f)
+			if (input_f) {
 				fclose (input_f);
+				input_f=NULL;
+			}
 			DO_SYSLOG((LOG_INFO, "%s/%s: got %d",
 					   shortname, protname(), c));
 			return ERROR;
 		case ZCAN:
-			if (input_f)
+			if (input_f) {
 				fclose (input_f);
+				input_f=NULL;
+			}
 			DO_SYSLOG((LOG_INFO, "%s/%s: got ZCAN",
-					   shortname, protname(), c));
+					   shortname, protname()));
 			return ERROR;
 		case ZSKIP:
-			if (input_f)
+			if (input_f) {
 				fclose (input_f);
+				input_f=NULL;
+			}
 			DO_SYSLOG((LOG_INFO, "%s/%s: got ZSKIP",
-					   shortname, protname(), c));
-			return c;
+					   shortname, protname()));
+			return ZSKIP;
 		case ZACK:
 		case ZRPOS:
 			break;
@@ -2161,14 +2152,18 @@ zsendfdata (struct zm_fileinfo *zi)
 		case ZRINIT:
 			return OK;
 		case ZSKIP:
-			if (input_f)
+			if (input_f) {
 				fclose (input_f);
+				input_f=NULL;
+			}
 			DO_SYSLOG((LOG_INFO, "%s/%s: got ZSKIP",
 					   shortname, protname()));
 			return c;
 		default:
-			if (input_f)
+			if (input_f) {
 				fclose (input_f);
+				input_f=NULL;
+			}
 			DO_SYSLOG((LOG_INFO, "%s/%s: got %d",
 					   shortname, protname(), c));
 			return ERROR;
@@ -2303,12 +2298,12 @@ calc_blklen(long total_sent)
 static int 
 getinsync(struct zm_fileinfo *zi, int flag)
 {
-	int c;
 	size_t rxpos;
 
 	for (;;) {
-		c = zgethdr(Rxhdr, 0, &rxpos);
-		switch (c) {
+		int gotblock;
+		gotblock = zgethdr(Rxhdr, 0, &rxpos);
+		switch (gotblock) {
 		case ZCAN:
 		case ZABORT:
 		case ZFIN:
@@ -2332,7 +2327,7 @@ getinsync(struct zm_fileinfo *zi, int flag)
 				error_count++;
 			}
 			Lastsync = rxpos;
-			return c;
+			return ZRPOS;
 		case ZACK:
 			Lrxpos = rxpos;
 			if (flag || zi->bytes_sent == rxpos)
@@ -2340,15 +2335,17 @@ getinsync(struct zm_fileinfo *zi, int flag)
 			continue;
 		case ZRINIT:
 		case ZSKIP:
-			if (input_f)
-				fclose(input_f);
+			if (input_f) {
+				fclose (input_f);
+				input_f=NULL;
+			}
 #ifdef HAVE_MMAP
 			else if (mm_addr) {
 				munmap(mm_addr,mm_size);
 				mm_addr=NULL;
 			}
 #endif
-			return c;
+			return ZSKIP;
 		case ERROR:
 		default:
 			error_count++;
diff --git a/src/rbsb.c b/src/rbsb.c
index ab1d36a..88b977c 100644
--- a/src/rbsb.c
+++ b/src/rbsb.c
@@ -98,11 +98,12 @@ static struct {
 	{0, 0}
 };
 
+static unsigned getspeed __P((speed_t));
+
 static unsigned
 getspeed(speed_t code)
 {
 	int n;
-
 	for (n=0; speeds[n].baudr; ++n)
 		if (speeds[n].speedcode == code)
 			return speeds[n].baudr;
@@ -295,8 +296,11 @@ io_mode(int fd, int n)
 		if (n==3) /* with flow control */
 			tty.c_iflag |= IXOFF;
 
-		 /* No echo, crlf mapping, INTR, QUIT, delays, no erase/kill */
-		tty.c_lflag &= ~(ECHO | ICANON | ISIG);
+		/* Setup raw mode: no echo, noncanonical (no edit chars),
+		 * no signal generating chars, and no extended chars (^V, 
+		 * ^O, ^R, ^W).
+		 */
+		tty.c_lflag &= ~(ECHO | ICANON | ISIG | IEXTEN);
 		tty.c_oflag = 0;	/* Transparent output */
 
 		tty.c_cflag &= ~(PARENB);	/* Same baud rate, disable parity */
diff --git a/src/tcp.c b/src/tcp.c
index 137f94c..7e1ba3f 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -39,9 +39,9 @@
 #include "error.h"
 
 static RETSIGTYPE
-tcp_alarm_handler(int dummy LRZSZ_ATTRIB_UNUSED)
+tcp_alarm_handler(int dummy)
 {
-    /* doesn't need to do anything */
+	dummy++; /* doesn't need to do anything */
 }
 
 
@@ -56,7 +56,7 @@ tcp_server (char *buf)
 	struct sockaddr_in s;
 	struct sockaddr_in t;
 	int on=1;
-	size_t len;
+	socklen_t len;
 
 	if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
 		error(1,errno,"socket");
@@ -91,7 +91,7 @@ tcp_accept (int d)
 {
 	int so;
 	struct  sockaddr_in s;
-	size_t namelen;
+	socklen_t namelen;
 	int num=0;
 
 	namelen = sizeof(s);
diff --git a/src/zm.c b/src/zm.c
index 56af141..0d742ab 100644
--- a/src/zm.c
+++ b/src/zm.c
@@ -102,6 +102,7 @@ static int zrhhdr __P ((char *hdr));
 static char zsendline_tab[256];
 static int zrdat32 __P ((char *buf, int length, size_t *));
 static void zsbh32 __P ((char *hdr, int type));
+static inline void zsendline_s __P((const char *s, size_t count));
 
 extern int zmodem_requested;
 
diff --git a/src/zreadline.c b/src/zreadline.c
index aeda95c..dd9736b 100644
--- a/src/zreadline.c
+++ b/src/zreadline.c
@@ -44,9 +44,9 @@ int readline_left=0;
 char *readline_ptr;
 
 static RETSIGTYPE
-zreadline_alarm_handler(int dummy LRZSZ_ATTRIB_UNUSED)
+zreadline_alarm_handler(int dummy)
 {
-	/* doesn't need to do anything */
+	dummy++; /* doesn't need to do anything */
 }
 
 /*
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index e54467e..18d8162 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,6 +49,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -91,25 +92,24 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-AUTOMAKE_OPTIONS=dejagnu
+AUTOMAKE_OPTIONS = dejagnu
 
-DISTFILES=Makefile.am Makefile.in
-CLEANFILES=lrzsz.log lrzsz.sum site.bak
-DISTCLEANFILES=site.exp
+DISTFILES = Makefile.am Makefile.in
+CLEANFILES = lrzsz.log lrzsz.sum site.bak
+DISTCLEANFILES = site.exp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 
 
-TAR = tar
-GZIP = --best
+TAR = gtar
+GZIP_ENV = --best
 EXPECT = expect
 RUNTEST = runtest
-all: Makefile
-
+all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps testsuite/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -127,11 +127,15 @@ subdir = testsuite
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
-	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 
 RUNTESTFLAGS =
 
@@ -149,7 +153,7 @@ check-DEJAGNU: site.exp
 	fi
 site.exp: Makefile
 	@echo 'Making a new site.exp file...'
-	-@rm -f site.bak
+	@test ! -f site.bak || rm -f site.bak
 	@echo '## these variables are automatically generated by make ##' > $@-t
 	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
 	@echo '# edit the last section' >> $@-t
@@ -157,57 +161,69 @@ site.exp: Makefile
 	@echo 'set srcdir $(srcdir)' >> $@-t
 	@echo 'set objdir' `pwd` >> $@-t
 	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	-@sed '1,/^## All variables above are.*##/ d' site.bak >> $@-t
-	-@mv site.exp site.bak
+	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
+	@test ! -f site.exp || mv site.exp site.bak
 	@mv $@-t site.exp
-info:
-dvi:
-check: all
-	$(MAKE) check-DEJAGNU
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-generic
+mostlyclean-am:  mostlyclean-generic
 
-clean:  clean-generic mostlyclean
+mostlyclean: mostlyclean-am
 
-distclean:  distclean-generic clean
-	-rm -f config.status
+clean-am:  clean-generic mostlyclean-am
 
-maintainer-clean:  maintainer-clean-generic distclean
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: tags distdir check-DEJAGNU info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir check-DEJAGNU info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
diff --git a/testsuite/lrzsz/compatability.exp b/testsuite/lrzsz/compatability.exp
index 2da38f4..d8347aa 100644
--- a/testsuite/lrzsz/compatability.exp
+++ b/testsuite/lrzsz/compatability.exp
@@ -20,9 +20,9 @@ if [string compare "$omen_sz" 0] {
     	$objdir/../src/lrz "-q --errors 32768" $files
 } else {
 	set bn [file tail $omen_sz]
-	unsupported "compat-$bn: $bn not available"
-	unsupported "compat-$bn-delay: $bn not available"
-	unsupported "compat-$bn-errors: $bn not available"
+	unsupported "compat-omen-sz: omen.sz not available"
+	unsupported "compat-omen-sz-delay: omen.sz not available"
+	unsupported "compat-omen-sz-errors: omen.sz not available"
 }
 if [string compare "$zmtx" 0] {
 	set bn [file tail $zmtx]
diff --git a/testsuite/lrzsz/null.exp b/testsuite/lrzsz/null.exp
new file mode 100644
index 0000000..ef372ea
--- /dev/null
+++ b/testsuite/lrzsz/null.exp
@@ -0,0 +1,32 @@
+load_lib "lrzsz.exp"
+if $tracelevel then {
+    strace $tracelevel
+}
+
+
+# why ascii mode? xmodem in binary mode appends ^Zs to pad blocks ...
+# 
+exec sh -c "rm -f $objdir/null ; touch $objdir/null";
+runxmodem xmodem $objdir/../src/lsz "-qa" \
+	$objdir/../src/lrz "-qa" $objdir/null
+runxmodem xmodem-1k $objdir/../src/lsz "-qa --1024" \
+	$objdir/../src/lrz "-qa" $objdir/null
+runxmodem xmodem-crc $objdir/../src/lsz "-qa" \
+	$objdir/../src/lrz "-qa --with-crc" $objdir/null
+
+runthem ymodem $objdir/../src/lsz "-q --ymodem" \
+	$objdir/../src/lrz "-q --ymodem" $objdir/null 
+runthem ymodem-1k $objdir/../src/lsz "-q --ymodem --1024" \
+	$objdir/../src/lrz "-q --ymodem" $objdir/null 
+
+runthem zmodem $objdir/../src/lsz "-q" \
+	$objdir/../src/lrz "-q" $objdir/null
+runthem zmodem-buffered $objdir/../src/lsz "-q $SZBUFSIZE" \
+	$objdir/../src/lrz "-q $SZBUFSIZE" $objdir/null
+runthem zmodem-turbo $objdir/../src/lsz "-qT" \
+	$objdir/../src/lrz "-q" $objdir/null
+runthem zmodem4k $objdir/../src/lsz "-q4" \
+	$objdir/../src/lrz "-q" $objdir/null
+runthem zmodem-start4k $objdir/../src/lsz "-q44" \
+	$objdir/../src/lrz "-q" $objdir/null
+exec sh -c "rm -f $objdir/null";