diff -ruN old/mc-4.5.34/Makefile.in new/mc-4.5.35/Makefile.in
--- old/mc-4.5.34/Makefile.in	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/Makefile.in	Mon Jul  5 21:18:55 1999
@@ -19,14 +19,12 @@
 		config.h.in mc-aclocal.m4 aclocal.m4 acconfig.h \
 		VERSION mcfn_install.in Make.common.in README.PC \
 		mc.spec mc.spec.in Specfile README.QNX VERSION.in \
-		mkinstalldirs autogen.sh ABOUT-NLS gettext.m4	\
+		mkinstalldirs autogen.sh ABOUT-NLS gettext.m4 \
 		config.guess config.sub
 
 all: 
 	@for dir in @INTLSUB@ ${codedirs} @POSUB@; do \
-		cd $$dir; \
-		${MAKE} all || exit 1; \
-		cd .. ;\
+		(cd $$dir; ${MAKE} all || exit 1) \
 	done
 
 static:
@@ -111,6 +109,7 @@
 	for I in $(alldirs); do \
 	    mkdir ../mc-$(VERSION)/$$I; \
 	    cd $$I ; \
+	    echo Processing $$I; \
 	    $(MAKE) distcopy VERSION=$(VERSION) PACKAGE=mc || exit 1; \
 	    cd ..; done
 	mkdir ../mc-$(VERSION)/macros
diff -ruN old/mc-4.5.34/Specfile new/mc-4.5.35/Specfile
--- old/mc-4.5.34/Specfile	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/Specfile	Mon Jul  5 21:18:55 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      4.5.34
+%define ver      4.5.35
 %define rel      1
 %define prefix  /usr
 
@@ -41,7 +41,7 @@
 Midnight file system (currently, only the Midnight Commander file manager).
 
 %prep
-%setup
+%setup -q
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
diff -ruN old/mc-4.5.34/VERSION new/mc-4.5.35/VERSION
--- old/mc-4.5.34/VERSION	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/VERSION	Mon Jul  5 21:18:55 1999
@@ -1 +1 @@
-#define VERSION "4.5.34"
+#define VERSION "4.5.35"
diff -ruN old/mc-4.5.34/aclocal.m4 new/mc-4.5.35/aclocal.m4
--- old/mc-4.5.34/aclocal.m4	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/aclocal.m4	Mon Jul  5 21:18:55 1999
@@ -2339,7 +2339,7 @@
 	if test -n "$3"; then
 	  n="$3"
 	  for i in $n; do
-	    AC_MSG_CHECKING(extra library $i)
+	    AC_MSG_CHECKING(extra library \"$i\")
 	    case $i in 
 	      applets)
 		AC_SUBST(GNOME_APPLETS_LIBS)
diff -ruN old/mc-4.5.34/config.guess new/mc-4.5.35/config.guess
--- old/mc-4.5.34/config.guess	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/config.guess	Mon Jul  5 21:18:55 1999
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -46,20 +47,60 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    news*:NEWS-OS:6.*:*)
-        echo mips-sony-newsos6
-        exit 0 ;;
     alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+	cat <<EOF >$dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./$dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -71,23 +112,57 @@
       echo m68k-cbm-netbsd${UNAME_RELEASE}
       exit 0 ;;
     amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    Pyramid*:OSx*:*:*)
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
 	else
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    sun4*:SunOS:5.*:*)
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     i86pc:SunOS:5.*:*)
-	echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -107,23 +182,53 @@
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
     atari*:NetBSD:*:*)
 	echo m68k-atari-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
@@ -131,10 +236,34 @@
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    mips:*:4*:UMIPS)
-	echo mips-mips-riscos4sysv
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
-    mips:*:5*:RISCos)
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -178,15 +307,15 @@
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 	exit 0 ;;
-   ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i[34]86:AIX:*:*)
+    i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
+		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
 		main()
@@ -197,8 +326,8 @@
 			exit(0);
 			}
 EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
+		${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -207,7 +336,8 @@
 	fi
 	exit 0 ;;
     *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -226,7 +356,7 @@
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to 
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
@@ -240,18 +370,50 @@
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
+              sed 's/^              //' << EOF >$dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
 	main ()
@@ -276,8 +438,8 @@
 	  exit (0);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -286,12 +448,25 @@
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
+    *9??*:MPE*:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    *9??*:MPE*:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
@@ -313,34 +488,56 @@
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
-    CRAY*T3E:*:*:*)
-        echo t3e-cray-unicos_mk
-        exit 0 ;;
     CRAY*X-MP:*:*:*)
 	echo xmp-cray-unicos
         exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
-    CRAY*C90:*:*:*)
-	echo c90-cray-unicos${UNAME_RELEASE}
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo t3e-cray-unicosmk${UNAME_RELEASE}
+	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
+    *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     *:NetBSD:*:*)
@@ -349,90 +546,206 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
-    *:QNX:*:4*)
-       echo i386-qnx-qnx4 
-       exit 0 ;;
     i*:CYGWIN*:*)
-	echo i386-unknown-cygwin32
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
     p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
+	echo powerpcle-unknown-cygwin
 	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
+#	# uname on the ARM produces all sorts of strangeness, and we need to
+#	# filter it out.
+#	case "$UNAME_MACHINE" in
+#	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
+#	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+#	esac
+
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us.
 	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
-	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux ; exit 0
-	else
-	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32arm)   echo "${UNAME_MACHINE}-unknown-linux-gnu"     ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >$dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} $dummy.s -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac
+
+			objdump --private-headers $dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi
+		rm -f $dummy.s $dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	else
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
 	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
+	  cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
-  printf ("%s-unknown-linux\n", argv[1]);
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
 #else
-  printf ("%s-unknown-linuxaout\n", argv[1]);
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
-    i[34]86:DYNIX/ptx:4*:*)
+    i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i[34]86:*:3.2:*)
+    i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv32
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
 	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
 	exit 0 ;;
-	*:UnixWare:*:*)
-		echo ${UNAME_MACHINE}-UnixWare-sysv${UNAME_RELEASE}
-		exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
     Intel:Mach:3*:*)
-	echo i386-unknown-mach3
+	echo i386-pc-mach3
 	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
@@ -448,30 +761,39 @@
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3 && exit 0
-        uname -p 2>/dev/null | grep entium >/dev/null \
-          && echo i586-ncr-sysv4.3 && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m680[234]0:LynxOS:2.[23]*:*)
-	echo m68k-lynx-lynxos${UNAME_RELEASE}
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i[34]86:LynxOS:2.[23]*:*)
-	echo i386-lynx-lynxos${UNAME_RELEASE}
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    TSUNAMI:LynxOS:2.[23]*:*)
-	echo sparc-lynx-lynxos${UNAME_RELEASE}
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.[23]*:*)
-	echo rs6000-lynx-lynxos${UNAME_RELEASE}
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
 	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
@@ -484,25 +806,59 @@
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-	*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
 	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    R3000:*System_V*:*:*)
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -540,7 +896,10 @@
 #endif
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
 
@@ -557,7 +916,7 @@
 #endif
 
 #if defined (__386BSD__)
-  printf ("i386-unknown-bsd\n"); exit (0);
+  printf ("i386-pc-bsd\n"); exit (0);
 #endif
 
 #if defined (sequent)
@@ -600,8 +959,8 @@
 }
 EOF
 
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
diff -ruN old/mc-4.5.34/config.sub new/mc-4.5.35/config.sub
--- old/mc-4.5.34/config.sub	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/config.sub	Mon Jul  5 21:18:55 1999
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can. 
+# can handle that machine.  It does not imply ALL GNU software can.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -41,6 +41,8 @@
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
 if [ x$1 = x ]
@@ -62,11 +64,21 @@
 	;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
 
 ### Let's recognize common machines as not being operating systems so
 ### that things like config.sub decstation-3100 work.  We also
@@ -81,52 +93,43 @@
 	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond )	# CYGNUS LOCAL
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
 		os=
 		basic_machine=$1
 		;;
-	-apple*)					# CYGNUS LOCAL
-		os=
-		basic_machine=$1
-		;;
-	-scout)						# CYGNUS LOCAL
-		;;
-	-wrs)						# CYGNUS LOCAL
-		os=vxworks
-		basic_machine=$1
-		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*)
 		os=-lynxos
@@ -137,67 +140,60 @@
 	-windowsnt*)
 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 		;;
+	-psos*)
+		os=-psos
+		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | armeb \
-		| armel | pyramid \
-		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
-		| powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparc8 | supersparc | microsparc | ultrasparc)
-		basic_machine=$basic_machine-unknown
-		;;
-	m88110 | m680[012346]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
-		basic_machine=$basic_machine-unknown
-		;;
-	mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| hppa2.0w \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el | armv[34][lb] \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | arme[lb]-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* \
-	      | mips64-* | mipsel-* | mips64el-* | mips64orion-* \
-	      | mips64orionel-* | sparc8-* | supersparc-* | microsparc-* | ultrasparc-*)
-		;;
-	m88110-* | m680[012346]0-* | m683?2-* | m68360-* | z8k-* | h8500-*) # CYGNUS LOCAL
-		;;
-	mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | hppa2.0w-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-* | armv*-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)						# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
-	a29khif)					# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)					# CYGNUS LOCAL
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -215,9 +211,9 @@
 	amiga | amiga-*)
 		basic_machine=m68k-cbm
 		;;
-	amigados)
+	amigaos | amigados)
 		basic_machine=m68k-cbm
-		os=-amigados
+		os=-amigaos
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-cbm
@@ -227,26 +223,14 @@
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
-	apollo68bsd)					# CYGNUS LOCAL
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	arm | armel | armeb)
-		basic_machine=arm-arm
-		os=-aout
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
 		;;
 	balance)
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	t3e-cray)
-		basic_machine=t3e-cray
-		os=-unicos_mk
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -275,6 +259,10 @@
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
@@ -311,10 +299,6 @@
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)		# CYGNUS LOCAL
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -333,14 +317,6 @@
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
-	h8300xray)					# CYGNUS LOCAL
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)					# CYGNUS LOCAL
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -356,22 +332,6 @@
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
-        w89k-*)						# CYGNUS LOCAL
-                basic_machine=hppa1.1-winbond
-                os=-proelf
-                ;;
-        op50n-*)					# CYGNUS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        op60c-*)					# CYGNUS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        hppro)						# CYGNUS LOCAL
-                basic_machine=hppa1.1-hp
-                os=-proelf
-                ;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
@@ -384,43 +344,38 @@
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
-	hppaosf)					# CYGNUS LOCAL
-		basic_machine=hppa1.1-hp
-		os=-osf
+	hppa-next)
+		os=-nextstep3
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		os=-mpeix
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		os=-mpeix
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3456]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3456]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3456]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
-	i386mach)					# CYGNUS LOCAL
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	i386-go32 | go32)				# CYGNUS LOCAL
-		basic_machine=i386-unknown
-		os=-go32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -449,27 +404,27 @@
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	monitor)					# CYGNUS LOCAL
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	msdos)						# CYGNUS LOCAL
-		basic_machine=i386-unknown	
-		os=-msdos
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
-	netbsd386)
-		basic_machine=i386-unknown		# CYGNUS LOCAL
-		os=-netbsd
+	netwinder)
+		basic_machine=armv4l-corel
+		os=-linux
 		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
@@ -483,10 +438,6 @@
 		basic_machine=mips-sony
 		os=-newsos
 		;;
-	necv70)						# CYGNUS LOCAL
-		basic_machine=v70-nec
-		os=-sysv
-		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -515,14 +466,6 @@
 	np1)
 		basic_machine=np1-gould
 		;;
-	OSE68000 | ose68000)				# CYGNUS LOCAL
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)						# CYGNUS LOCAL
-		basic_machine=m68k-none
-		os=-os68k
-		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -540,25 +483,23 @@
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumii | pentium2)
+		basic_machine=i786-pc
 		;;
-	pentium-* | p5-*)
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexgen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -578,20 +519,12 @@
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	rom68k)						# CYGNUS LOCAL
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
-	sa29200)					# CYGNUS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -599,24 +532,6 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)					# CYGNUS LOCAL
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sparcfrw)					# CYGNUS LOCAL
-		basic_machine=sparcfrw-sun
-		os=-sunos4
-		;;
-	sparcfrwcompat)					# CYGNUS LOCAL
-		basic_machine=sparcfrwcompat-sun
-		os=-sunos4
-		;;
-	sparclitefrw)					# CYGNUS LOCAL
-		basic_machine=sparclitefrw-fujitsu
-		;;
-	sparclitefrwcompat)				# CYGNUS LOCAL
-		basic_machine=sparclitefrwcompat-fujitsu
-		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -624,13 +539,6 @@
 	spur)
 		basic_machine=spur-unknown
 		;;
-	st2000)						# CYGNUS LOCAL
-		basic_machine=m68k-tandem
-		;;
-	stratus)					# CYGNUS LOCAL
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -675,6 +583,12 @@
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -686,10 +600,6 @@
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
-	v810 | necv810)					# CYGNUS LOCAL
-		basic_machine=v810-nec
-		os=-none
-		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -698,6 +608,9 @@
 		basic_machine=vax-dec
 		os=-vms
 		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -706,13 +619,9 @@
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
-        vxworks29k)					# CYGNUS LOCAL
-                basic_machine=a29k-wrs
-                os=-vxworks
-                ;;
-	w65*)						# CYGNUS LOCAL
- 		basic_machine=w65-wdc
- 		os=-none
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
 		;;
 	xmp)
 		basic_machine=xmp-cray
@@ -721,10 +630,6 @@
         xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-	z8k-*-coff)					# CYGNUS LOCAL
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -732,17 +637,12 @@
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
-	w89k)						# CYGNUS LOCAL
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)						# CYGNUS LOCAL
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)						# CYGNUS LOCAL
-		basic_machine=hppa1.1-oki
-		;;
 	mips)
-		basic_machine=mips-mips
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
 		;;
 	romp)
 		basic_machine=romp-ibm
@@ -771,12 +671,6 @@
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
-	mac | mpw | mac-mpw)				# CYGNUS LOCAL
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)				# CYGNUS LOCAL
-		basic_machine=powerpc-apple
-		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -800,6 +694,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -807,35 +703,37 @@
 	-solaris)
 		os=-solaris2
 		;;
-	-unixware* | svr4*)
+	-svr4*)
 		os=-sysv4
 		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
 	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# First accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative must end in a *, to match a version number.
+	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -lites* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[3456]* \
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -moss* | -newsos* | -unicos* | -aos* \
-	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -openbsd* \
-	      | -riscix*  | -lites* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi \
-	      | -eabi* | -ieee*)
-		;;
-	# CYGNUS LOCAL
-	-go32 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug |  -netware* | -proelf | -os9* \
-	      | -macos* | -mpw* | -magic* | -pe* | -win32)
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
+	      | -openstep* | -mpeix* | -oskit*)
+	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-mac*)						# CYGNUS LOCAL
-		os=`echo $os | sed -e 's|mac|macos|'`
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
@@ -858,12 +756,12 @@
 	-acis*)
 		os=-aos
 		;;
-	-386bsd)					# CYGNUS LOCAL
-		os=-bsd
-		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -889,12 +787,6 @@
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
-	-ose*)						# CYGNUS LOCAL
-		os=-ose
-		;;
-	-es1800*)					# CYGNUS LOCAL
-		os=-ose
-		;;
 	-xenix)
 		os=-xenix
 		;;
@@ -923,6 +815,12 @@
 	*-acorn)
 		os=-riscix1.2
 		;;
+	arm*-corel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
         pdp11-*)
 		os=-none
 		;;
@@ -941,30 +839,18 @@
 		# default.
 		# os=-sunos4
 		;;
-	m68*-cisco)					# CYGNUS LOCAL
-		os=-aout
-		;;
-	mips*-cisco)					# CYGNUS LOCAL
-		os=-elf
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	*-be)
+		os=-beos
+		;;
 	*-ibm)
 		os=-aix
 		;;
-	*-wec)						# CYGNUS LOCAL
-		os=-proelf
-		;;
-	*-winbond)					# CYGNUS LOCAL
-		os=-proelf
-		;;
-	*-oki)						# CYGNUS LOCAL
-		os=-proelf
-		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -975,7 +861,7 @@
 		os=-sysv
 		;;
 	*-cbm)
-		os=-amigados
+		os=-amigaos
 		;;
 	*-dg)
 		os=-dgux
@@ -989,6 +875,9 @@
 	m88k-omron*)
 		os=-luna
 		;;
+	*-next )
+		os=-nextstep
+		;;
 	*-sequent)
 		os=-ptx
 		;;
@@ -1022,14 +911,8 @@
 	*-masscomp)
 		os=-rtu
 		;;
-	*-rom68k)					# CYGNUS LOCAL
-		os=-coff
-		;;
-	*-*bug)						# CYGNUS LOCAL
-		os=-coff
-		;;
-	*-apple)					# CYGNUS LOCAL
-		os=-macos
+	f301-fujitsu)
+		os=-uxpv
 		;;
 	*)
 		os=-none
@@ -1049,18 +932,18 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-bosx*)				# CYGNUS LOCAL
-				vendor=bull
-				;;
-			-lynxos*)
-				vendor=lynx
-				;;
 			-aix*)
 				vendor=ibm
 				;;
 			-hpux*)
 				vendor=hp
 				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
 			-hiux*)
 				vendor=hitachi
 				;;
@@ -1082,13 +965,10 @@
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxworks*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
-			-hms*)				# CYGNUS LOCAL
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)		# CYGNUS LOCAL
+			-aux*)
 				vendor=apple
 				;;
 		esac
diff -ruN old/mc-4.5.34/configure new/mc-4.5.35/configure
--- old/mc-4.5.34/configure	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/configure	Mon Jul  5 21:18:55 1999
@@ -588,7 +588,7 @@
 
 
 PACKAGE=mc
-VERSION=4.5.34
+VERSION=4.5.35
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -600,6 +600,115 @@
 
 
 
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+#    same time.
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:651: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:672: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:690: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+
 include_additional_path="/usr/local/include /usr/contrib/include /opt/gnu/include"
 
 use_cc_g_flag=yes
@@ -608,7 +717,7 @@
 unset CFLAGS
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:612: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:721: 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
@@ -637,7 +746,7 @@
 # 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:641: checking for $ac_word" >&5
+echo "configure:750: 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
@@ -667,7 +776,7 @@
   # 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:671: checking for $ac_word" >&5
+echo "configure:780: 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
@@ -718,7 +827,7 @@
       # 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:722: checking for $ac_word" >&5
+echo "configure:831: 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
@@ -750,7 +859,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:754: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:863: 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.
@@ -761,12 +870,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 765 "configure"
+#line 874 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:879: \"$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
@@ -792,12 +901,12 @@
   { 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:796: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:905: 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:801: checking whether we are using GNU C" >&5
+echo "configure:910: 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
@@ -806,7 +915,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:810: \"$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:919: \"$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
@@ -825,7 +934,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:829: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:938: 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
@@ -857,7 +966,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:861: checking how to run the C preprocessor" >&5
+echo "configure:970: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -872,13 +981,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 876 "configure"
+#line 985 "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:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:991: \"$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
   :
@@ -889,13 +998,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 893 "configure"
+#line 1002 "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:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1008: \"$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
   :
@@ -906,13 +1015,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 910 "configure"
+#line 1019 "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:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1025: \"$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
   :
@@ -939,7 +1048,7 @@
 # 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:943: checking for $ac_word" >&5
+echo "configure:1052: 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
@@ -967,7 +1076,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:971: checking whether ln -s works" >&5
+echo "configure:1080: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -992,7 +1101,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:996: checking for $ac_word" >&5
+echo "configure:1105: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1038,7 +1147,7 @@
 
 
 echo $ac_n "checking whether we are using GNU make""... $ac_c" 1>&6
-echo "configure:1042: checking whether we are using GNU make" >&5
+echo "configure:1151: checking whether we are using GNU make" >&5
 set dummy ${MAKE-make}; ac_make=$2
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_make'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1064,9 +1173,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1068: checking for AIX" >&5
+echo "configure:1177: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1070 "configure"
+#line 1179 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1089,17 +1198,17 @@
 
 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1093: checking for minix/config.h" >&5
+echo "configure:1202: 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 1098 "configure"
+#line 1207 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1212: \"$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*
@@ -1137,7 +1246,7 @@
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1141: checking for POSIXized ISC" >&5
+echo "configure:1250: 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
@@ -1158,7 +1267,7 @@
 fi
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1162: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1271: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1168,7 +1277,7 @@
 do
   CFLAGS="$ac_save_CFLAGS $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 1172 "configure"
+#line 1281 "configure"
 #include "confdefs.h"
 #include <signal.h>
 #if !defined(__STDC__) || __STDC__ != 1
@@ -1182,7 +1291,7 @@
 struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:1186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -1202,19 +1311,19 @@
 esac
 
 echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6
-echo "configure:1206: checking whether sys/types.h defines makedev" >&5
+echo "configure:1315: checking whether sys/types.h defines makedev" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1320 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 return makedev(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_sys_types_h_makedev=yes
 else
@@ -1232,17 +1341,17 @@
 if test $ac_cv_header_sys_types_h_makedev = no; then
 ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6
-echo "configure:1236: checking for sys/mkdev.h" >&5
+echo "configure:1345: checking for sys/mkdev.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 1241 "configure"
+#line 1350 "configure"
 #include "confdefs.h"
 #include <sys/mkdev.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1355: \"$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*
@@ -1270,17 +1379,17 @@
   if test $ac_cv_header_sys_mkdev_h = no; then
 ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6
-echo "configure:1274: checking for sys/sysmacros.h" >&5
+echo "configure:1383: checking for sys/sysmacros.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 1388 "configure"
 #include "confdefs.h"
 #include <sys/sysmacros.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; }
+{ (eval echo configure:1393: \"$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*
@@ -1308,12 +1417,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1312: checking for working const" >&5
+echo "configure:1421: 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 1317 "configure"
+#line 1426 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1362,7 +1471,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1385,7 +1494,7 @@
 # Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1389: checking for $ac_word" >&5
+echo "configure:1498: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1421,7 +1530,7 @@
 # Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1425: checking for $ac_word" >&5
+echo "configure:1534: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1457,7 +1566,7 @@
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1461: checking for $ac_word" >&5
+echo "configure:1570: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1493,7 +1602,7 @@
 # Extract the first word of "chmod", so it can be a program name with args.
 set dummy chmod; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1497: checking for $ac_word" >&5
+echo "configure:1606: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1529,7 +1638,7 @@
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1533: checking for $ac_word" >&5
+echo "configure:1642: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1566,7 +1675,7 @@
 # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1570: checking for $ac_word" >&5
+echo "configure:1679: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_system'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1598,7 +1707,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1602: checking for $ac_word" >&5
+echo "configure:1711: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_X11_WWW'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1633,12 +1742,12 @@
 
 ALL_LINGUAS="ca cs da de es es_ES fi fr hu it ja ko no pl ro ru wa zh_TW.Big5"
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1637: checking for ANSI C header files" >&5
+echo "configure:1746: 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 1642 "configure"
+#line 1751 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1646,7 +1755,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1759: \"$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*
@@ -1663,7 +1772,7 @@
 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 1667 "configure"
+#line 1776 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1681,7 +1790,7 @@
 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 1685 "configure"
+#line 1794 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1702,7 +1811,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1706 "configure"
+#line 1815 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1713,7 +1822,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1737,21 +1846,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1741: checking for inline" >&5
+echo "configure:1850: 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 1748 "configure"
+#line 1857 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1777,12 +1886,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1781: checking for off_t" >&5
+echo "configure:1890: 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 1786 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1810,12 +1919,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1814: checking for size_t" >&5
+echo "configure:1923: 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 1819 "configure"
+#line 1928 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1845,19 +1954,19 @@
 # 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:1849: checking for working alloca.h" >&5
+echo "configure:1958: 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 1854 "configure"
+#line 1963 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1970: \"$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
@@ -1878,12 +1987,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1882: checking for alloca" >&5
+echo "configure:1991: 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 1887 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1911,7 +2020,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2024: \"$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
@@ -1943,12 +2052,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1947: checking whether alloca needs Cray hooks" >&5
+echo "configure:2056: 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 1952 "configure"
+#line 2061 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1973,12 +2082,12 @@
 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:1977: checking for $ac_func" >&5
+echo "configure:2086: 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 1982 "configure"
+#line 2091 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2001,7 +2110,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2114: \"$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
@@ -2028,7 +2137,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2032: checking stack direction for C alloca" >&5
+echo "configure:2141: 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
@@ -2036,7 +2145,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+#line 2149 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2055,7 +2164,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2168: \"$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
@@ -2080,17 +2189,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2084: checking for $ac_hdr" >&5
+echo "configure:2193: 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 2089 "configure"
+#line 2198 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2203: \"$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*
@@ -2119,12 +2228,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2123: checking for $ac_func" >&5
+echo "configure:2232: 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 2128 "configure"
+#line 2237 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2147,7 +2256,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2260: \"$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
@@ -2172,7 +2281,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2176: checking for working mmap" >&5
+echo "configure:2285: 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
@@ -2180,7 +2289,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2184 "configure"
+#line 2293 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2320,7 +2429,7 @@
 }
 
 EOF
-if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2433: \"$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
@@ -2348,17 +2457,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2352: checking for $ac_hdr" >&5
+echo "configure:2461: 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 2357 "configure"
+#line 2466 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2471: \"$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*
@@ -2388,12 +2497,12 @@
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2392: checking for $ac_func" >&5
+echo "configure:2501: 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 2397 "configure"
+#line 2506 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2416,7 +2525,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2529: \"$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
@@ -2445,12 +2554,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_func" >&5
+echo "configure:2558: 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 2454 "configure"
+#line 2563 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2473,7 +2582,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2586: \"$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
@@ -2507,19 +2616,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2511: checking for LC_MESSAGES" >&5
+echo "configure:2620: 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 2516 "configure"
+#line 2625 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2632: \"$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
@@ -2540,7 +2649,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2544: checking whether NLS is requested" >&5
+echo "configure:2653: 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"
@@ -2560,7 +2669,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2564: checking whether included gettext is requested" >&5
+echo "configure:2673: 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"
@@ -2579,17 +2688,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2583: checking for libintl.h" >&5
+echo "configure:2692: 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 2588 "configure"
+#line 2697 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2702: \"$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*
@@ -2606,19 +2715,19 @@
 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:2610: checking for gettext in libc" >&5
+echo "configure:2719: 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 2615 "configure"
+#line 2724 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2731: \"$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
@@ -2634,7 +2743,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2638: checking for bindtextdomain in -lintl" >&5
+echo "configure:2747: 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
@@ -2642,7 +2751,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2646 "configure"
+#line 2755 "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
@@ -2653,7 +2762,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2766: \"$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
@@ -2669,19 +2778,19 @@
 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:2673: checking for gettext in libintl" >&5
+echo "configure:2782: 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 2678 "configure"
+#line 2787 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -2709,7 +2818,7 @@
 	      # 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:2713: checking for $ac_word" >&5
+echo "configure:2822: 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
@@ -2743,12 +2852,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2747: checking for $ac_func" >&5
+echo "configure:2856: 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 2752 "configure"
+#line 2861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2771,7 +2880,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2884: \"$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
@@ -2798,7 +2907,7 @@
 		# 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:2802: checking for $ac_word" >&5
+echo "configure:2911: 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
@@ -2834,7 +2943,7 @@
 		# 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:2838: checking for $ac_word" >&5
+echo "configure:2947: 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
@@ -2866,7 +2975,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2979 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2874,7 +2983,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -2897,7 +3006,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2901: checking whether catgets can be used" >&5
+echo "configure:3010: 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"
@@ -2910,7 +3019,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2914: checking for main in -li" >&5
+echo "configure:3023: 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
@@ -2918,14 +3027,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2922 "configure"
+#line 3031 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3038: \"$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
@@ -2953,12 +3062,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2957: checking for catgets" >&5
+echo "configure:3066: 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 2962 "configure"
+#line 3071 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -2981,7 +3090,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3094: \"$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
@@ -3003,7 +3112,7 @@
 	       # 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:3007: checking for $ac_word" >&5
+echo "configure:3116: 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
@@ -3039,7 +3148,7 @@
 		 # 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:3043: checking for $ac_word" >&5
+echo "configure:3152: 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
@@ -3076,7 +3185,7 @@
 		   # 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:3080: checking for $ac_word" >&5
+echo "configure:3189: 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
@@ -3111,7 +3220,7 @@
 		 # 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:3115: checking for $ac_word" >&5
+echo "configure:3224: 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
@@ -3169,7 +3278,7 @@
         # 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:3173: checking for $ac_word" >&5
+echo "configure:3282: 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
@@ -3203,7 +3312,7 @@
         # 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:3207: checking for $ac_word" >&5
+echo "configure:3316: 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
@@ -3239,7 +3348,7 @@
         # 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:3243: checking for $ac_word" >&5
+echo "configure:3352: 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
@@ -3329,7 +3438,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3333: checking for catalogs to be installed" >&5
+echo "configure:3442: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3357,17 +3466,17 @@
    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:3361: checking for linux/version.h" >&5
+echo "configure:3470: 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 3366 "configure"
+#line 3475 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3480: \"$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*
@@ -3527,7 +3636,7 @@
   # Extract the first word of "glib-config", so it can be a program name with args.
 set dummy glib-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3531: checking for $ac_word" >&5
+echo "configure:3640: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3562,7 +3671,7 @@
 
   min_glib_version=1.2.0
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:3566: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:3675: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -3585,7 +3694,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 3589 "configure"
+#line 3698 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -3661,7 +3770,7 @@
 }
 
 EOF
-if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3695,7 +3804,7 @@
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 3699 "configure"
+#line 3808 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -3705,7 +3814,7 @@
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -3757,25 +3866,6 @@
 
 fi
 
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3788,7 +3878,7 @@
 # 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:3792: checking for a BSD compatible install" >&5
+echo "configure:3882: 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
@@ -3844,17 +3934,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3848: checking for $ac_hdr" >&5
+echo "configure:3938: 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 3853 "configure"
+#line 3943 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3948: \"$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*
@@ -3884,17 +3974,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3888: checking for $ac_hdr" >&5
+echo "configure:3978: 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 3893 "configure"
+#line 3983 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3988: \"$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*
@@ -3926,12 +4016,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3930: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:4020: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3935 "configure"
+#line 4025 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3947,7 +4037,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3972,12 +4062,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3976: checking for $ac_hdr that defines DIR" >&5
+echo "configure:4066: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3981 "configure"
+#line 4071 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3985,7 +4075,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4010,7 +4100,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4014: checking for opendir in -ldir" >&5
+echo "configure:4104: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4018,7 +4108,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4022 "configure"
+#line 4112 "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
@@ -4029,7 +4119,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4123: \"$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
@@ -4051,7 +4141,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4055: checking for opendir in -lx" >&5
+echo "configure:4145: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4059,7 +4149,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4063 "configure"
+#line 4153 "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
@@ -4070,7 +4160,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4164: \"$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
@@ -4094,7 +4184,7 @@
 
 
 echo $ac_n "checking filename fits on dirent.d_name""... $ac_c" 1>&6
-echo "configure:4098: checking filename fits on dirent.d_name" >&5
+echo "configure:4188: checking filename fits on dirent.d_name" >&5
 if eval "test \"`echo '$''{'ac_cv_dnamesize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4108,7 +4198,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 4112 "configure"
+#line 4202 "configure"
 #include "confdefs.h"
 
 #include <src/fs.h>
@@ -4125,7 +4215,7 @@
 
 
 EOF
-if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_dnamesize="no"
@@ -4154,12 +4244,12 @@
 echo "$ac_t""$ac_cv_dnamesize" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4158: checking for ANSI C header files" >&5
+echo "configure:4248: 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 4163 "configure"
+#line 4253 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4167,7 +4257,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4261: \"$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*
@@ -4184,7 +4274,7 @@
 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 4188 "configure"
+#line 4278 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4202,7 +4292,7 @@
 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 4206 "configure"
+#line 4296 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4223,7 +4313,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4227 "configure"
+#line 4317 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4234,7 +4324,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4266,12 +4356,12 @@
 
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:4270: checking for st_blksize in struct stat" >&5
+echo "configure:4360: checking for st_blksize in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4275 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4279,7 +4369,7 @@
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:4283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -4300,12 +4390,12 @@
 fi
 
 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:4304: checking for st_blocks in struct stat" >&5
+echo "configure:4394: checking for st_blocks in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4309 "configure"
+#line 4399 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4313,7 +4403,7 @@
 struct stat s; s.st_blocks;
 ; return 0; }
 EOF
-if { (eval echo configure:4317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blocks=yes
 else
@@ -4336,12 +4426,12 @@
 fi
 
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:4340: checking for st_rdev in struct stat" >&5
+echo "configure:4430: 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 4345 "configure"
+#line 4435 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4349,7 +4439,7 @@
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:4353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -4374,12 +4464,12 @@
 for ac_func in strerror statfs getwd strcasecmp strncasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4378: checking for $ac_func" >&5
+echo "configure:4468: 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 4383 "configure"
+#line 4473 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4402,7 +4492,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4496: \"$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
@@ -4429,12 +4519,12 @@
 for ac_func in strdup memmove pwdauth truncate initgroups putenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4433: checking for $ac_func" >&5
+echo "configure:4523: 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 4438 "configure"
+#line 4528 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4457,7 +4547,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4551: \"$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
@@ -4484,12 +4574,12 @@
 for ac_func in memset memcpy tcsetattr tcgetattr cfgetospeed
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4488: checking for $ac_func" >&5
+echo "configure:4578: 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 4493 "configure"
+#line 4583 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4512,7 +4602,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4606: \"$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
@@ -4539,12 +4629,12 @@
 for ac_func in sigaction sigemptyset sigprocmask sigaddset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4543: checking for $ac_func" >&5
+echo "configure:4633: 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 4548 "configure"
+#line 4638 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4567,7 +4657,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4661: \"$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
@@ -4594,12 +4684,12 @@
 for ac_func in sysconf setuid setreuid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4598: checking for $ac_func" >&5
+echo "configure:4688: 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 4603 "configure"
+#line 4693 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4622,7 +4712,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4716: \"$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
@@ -4650,12 +4740,12 @@
 for ac_func in getpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4654: checking for $ac_func" >&5
+echo "configure:4744: 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 4659 "configure"
+#line 4749 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4678,7 +4768,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4772: \"$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
@@ -4706,7 +4796,7 @@
 SHADOWLIB=
 if test x$system = xLinux; then
 echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
-echo "configure:4710: checking for pw_encrypt in -lshadow" >&5
+echo "configure:4800: checking for pw_encrypt in -lshadow" >&5
 ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4714,7 +4804,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lshadow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4718 "configure"
+#line 4808 "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
@@ -4725,7 +4815,7 @@
 pw_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4819: \"$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
@@ -4746,17 +4836,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4750: checking for $ac_hdr" >&5
+echo "configure:4840: 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 4755 "configure"
+#line 4845 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4850: \"$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*
@@ -4789,17 +4879,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4793: checking for $ac_hdr" >&5
+echo "configure:4883: 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 4798 "configure"
+#line 4888 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4893: \"$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*
@@ -4847,7 +4937,7 @@
 NEED_CRYPT_PROTOTYPE=yes
 if test x$ac_cv_header_crypt_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4851 "configure"
+#line 4941 "configure"
 #include "confdefs.h"
 #include <crypt.h>
 int main() { return 0; }
@@ -4868,7 +4958,7 @@
 else 
     if test x$ac_cv_header_unistd_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4872 "configure"
+#line 4962 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -4899,17 +4989,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4903: checking for $ac_hdr" >&5
+echo "configure:4993: 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 4908 "configure"
+#line 4998 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5003: \"$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*
@@ -4940,12 +5030,12 @@
 for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4944: checking for $ac_func" >&5
+echo "configure:5034: 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 4949 "configure"
+#line 5039 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4968,7 +5058,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5062: \"$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
@@ -4990,7 +5080,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:4994: checking for crypt in -lcrypt" >&5
+echo "configure:5084: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4998,7 +5088,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5002 "configure"
+#line 5092 "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
@@ -5009,7 +5099,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:5013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5103: \"$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
@@ -5029,7 +5119,7 @@
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for crypt in -lcrypt_i""... $ac_c" 1>&6
-echo "configure:5033: checking for crypt in -lcrypt_i" >&5
+echo "configure:5123: checking for crypt in -lcrypt_i" >&5
 ac_lib_var=`echo crypt_i'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5037,7 +5127,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt_i  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5041 "configure"
+#line 5131 "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
@@ -5048,7 +5138,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5142: \"$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
@@ -5078,12 +5168,12 @@
 for ac_func in grantpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5082: checking for $ac_func" >&5
+echo "configure:5172: 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 5087 "configure"
+#line 5177 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5106,7 +5196,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5200: \"$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
@@ -5134,7 +5224,7 @@
     :
 else
     echo $ac_n "checking for grantpt in -lpt""... $ac_c" 1>&6
-echo "configure:5138: checking for grantpt in -lpt" >&5
+echo "configure:5228: checking for grantpt in -lpt" >&5
 ac_lib_var=`echo pt'_'grantpt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5142,7 +5232,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5146 "configure"
+#line 5236 "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
@@ -5153,7 +5243,7 @@
 grantpt()
 ; return 0; }
 EOF
-if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5247: \"$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
@@ -5184,7 +5274,7 @@
 
 if test x$GCC = xyes; then
     echo $ac_n "checking for tolower in -lintl""... $ac_c" 1>&6
-echo "configure:5188: checking for tolower in -lintl" >&5
+echo "configure:5278: checking for tolower in -lintl" >&5
 ac_lib_var=`echo intl'_'tolower | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5192,7 +5282,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5196 "configure"
+#line 5286 "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
@@ -5203,7 +5293,7 @@
 tolower()
 ; return 0; }
 EOF
-if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5297: \"$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
@@ -5235,12 +5325,12 @@
 for ac_func in statlstat
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5239: checking for $ac_func" >&5
+echo "configure:5329: 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 5244 "configure"
+#line 5334 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5263,7 +5353,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5357: \"$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
@@ -5289,9 +5379,9 @@
 
 
 echo $ac_n "checking for AIX defines""... $ac_c" 1>&6
-echo "configure:5293: checking for AIX defines" >&5
+echo "configure:5383: checking for AIX defines" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5295 "configure"
+#line 5385 "configure"
 #include "confdefs.h"
 #if defined(AIX) || defined(_AIX) || defined(__aix__) || defined(aix)
 yes
@@ -5316,7 +5406,7 @@
 
 
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5320: checking for getmntent in -lgen" >&5
+echo "configure:5410: checking for getmntent in -lgen" >&5
 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5324,7 +5414,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5328 "configure"
+#line 5418 "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
@@ -5335,7 +5425,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5429: \"$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
@@ -5361,17 +5451,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5365: checking for $ac_hdr" >&5
+echo "configure:5455: 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 5370 "configure"
+#line 5460 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5465: \"$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*
@@ -5401,17 +5491,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5405: checking for $ac_hdr" >&5
+echo "configure:5495: 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 5410 "configure"
+#line 5500 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5505: \"$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*
@@ -5441,17 +5531,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5445: checking for $ac_hdr" >&5
+echo "configure:5535: 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 5450 "configure"
+#line 5540 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5545: \"$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*
@@ -5480,12 +5570,12 @@
     for ac_func in getmntinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5484: checking for $ac_func" >&5
+echo "configure:5574: 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 5489 "configure"
+#line 5579 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5508,7 +5598,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5602: \"$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
@@ -5535,12 +5625,12 @@
 
         
     echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6
-echo "configure:5539: checking for d_ino member in directory struct" >&5
+echo "configure:5629: checking for d_ino member in directory struct" >&5
     if eval "test \"`echo '$''{'fu_cv_sys_d_ino_in_dirent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5544 "configure"
+#line 5634 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5563,7 +5653,7 @@
 struct dirent dp; dp.d_ino = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   fu_cv_sys_d_ino_in_dirent=yes
 else
@@ -5590,7 +5680,7 @@
     # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
     # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
 echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6
-echo "configure:5594: checking for getmntent in -lsun" >&5
+echo "configure:5684: checking for getmntent in -lsun" >&5
 ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5598,7 +5688,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5602 "configure"
+#line 5692 "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
@@ -5609,7 +5699,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5703: \"$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
@@ -5628,7 +5718,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
-echo "configure:5632: checking for getmntent in -lseq" >&5
+echo "configure:5722: checking for getmntent in -lseq" >&5
 ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5636,7 +5726,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5640 "configure"
+#line 5730 "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
@@ -5647,7 +5737,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5741: \"$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
@@ -5666,7 +5756,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5670: checking for getmntent in -lgen" >&5
+echo "configure:5760: checking for getmntent in -lgen" >&5
 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5674,7 +5764,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5678 "configure"
+#line 5768 "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
@@ -5685,7 +5775,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5779: \"$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
@@ -5710,12 +5800,12 @@
 fi
 
 echo $ac_n "checking for getmntent""... $ac_c" 1>&6
-echo "configure:5714: checking for getmntent" >&5
+echo "configure:5804: checking for getmntent" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5719 "configure"
+#line 5809 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getmntent(); below.  */
@@ -5738,7 +5828,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getmntent=yes"
 else
@@ -5769,12 +5859,12 @@
       if test -z "$list_mounted_fs"; then
 	# SVR4
 	echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6
-echo "configure:5773: checking for two-argument getmntent function" >&5
+echo "configure:5863: checking for two-argument getmntent function" >&5
 	if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5778 "configure"
+#line 5868 "configure"
 #include "confdefs.h"
 #include <sys/mnttab.h>
 EOF
@@ -5803,7 +5893,7 @@
       if test -z "$list_mounted_fs"; then
 	# 4.3BSD, SunOS, HP-UX, Dynix, Irix
 	echo $ac_n "checking for one-argument getmntent function""... $ac_c" 1>&6
-echo "configure:5807: checking for one-argument getmntent function" >&5
+echo "configure:5897: checking for one-argument getmntent function" >&5
 	if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5832,12 +5922,12 @@
     if test -z "$list_mounted_fs"; then
       # DEC Alpha running OSF/1.
       echo $ac_n "checking for getfsstat function""... $ac_c" 1>&6
-echo "configure:5836: checking for getfsstat function" >&5
+echo "configure:5926: checking for getfsstat function" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_getsstat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5841 "configure"
+#line 5931 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5848,7 +5938,7 @@
       numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); 
 ; return 0; }
 EOF
-if { (eval echo configure:5852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   fu_cv_sys_mounted_getsstat=yes
 else
@@ -5873,17 +5963,17 @@
     if test -z "$list_mounted_fs"; then
       # AIX.
       echo $ac_n "checking for mntctl function and struct vmount""... $ac_c" 1>&6
-echo "configure:5877: checking for mntctl function and struct vmount" >&5
+echo "configure:5967: checking for mntctl function and struct vmount" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_vmount'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5882 "configure"
+#line 5972 "configure"
 #include "confdefs.h"
 #include <fshelp.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5977: \"$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*
@@ -5911,12 +6001,12 @@
     if test -z "$list_mounted_fs"; then
       # SVR3
       echo $ac_n "checking for existence of three headers""... $ac_c" 1>&6
-echo "configure:5915: checking for existence of three headers" >&5
+echo "configure:6005: checking for existence of three headers" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread_fstyp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5920 "configure"
+#line 6010 "configure"
 #include "confdefs.h"
 
 #include <sys/statfs.h>
@@ -5924,7 +6014,7 @@
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6018: \"$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*
@@ -5952,7 +6042,7 @@
     if test -z "$list_mounted_fs"; then
       # 4.4BSD and DEC OSF/1.
       echo $ac_n "checking for getmntinfo function""... $ac_c" 1>&6
-echo "configure:5956: checking for getmntinfo function" >&5
+echo "configure:6046: checking for getmntinfo function" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5960,7 +6050,7 @@
 	  ok=
 	  if test $ac_cv_func_getmntinfo = yes; then
 	    cat > conftest.$ac_ext <<EOF
-#line 5964 "configure"
+#line 6054 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 EOF
@@ -5993,19 +6083,19 @@
     if test -z "$list_mounted_fs"; then
       # Ultrix
       echo $ac_n "checking for getmnt function""... $ac_c" 1>&6
-echo "configure:5997: checking for getmnt function" >&5
+echo "configure:6087: checking for getmnt function" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6002 "configure"
+#line 6092 "configure"
 #include "confdefs.h"
 
 #include <sys/fs_types.h>
 #include <sys/mount.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6099: \"$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*
@@ -6033,17 +6123,17 @@
     if test -z "$list_mounted_fs"; then
       # SVR2
     echo $ac_n "checking whether it is possible to resort to fread on /etc/mnttab""... $ac_c" 1>&6
-echo "configure:6037: checking whether it is possible to resort to fread on /etc/mnttab" >&5
+echo "configure:6127: checking whether it is possible to resort to fread on /etc/mnttab" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6042 "configure"
+#line 6132 "configure"
 #include "confdefs.h"
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6137: \"$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*
@@ -6077,7 +6167,7 @@
 
 
     echo "checking how to get filesystem space usage" 1>&6
-echo "configure:6081: checking how to get filesystem space usage" >&5
+echo "configure:6171: checking how to get filesystem space usage" >&5
     space=no
 
     # Here we'll compromise a little (and perform only the link test)
@@ -6087,12 +6177,12 @@
       for ac_func in statvfs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6091: checking for $ac_func" >&5
+echo "configure:6181: 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 6096 "configure"
+#line 6186 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6115,7 +6205,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6209: \"$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
@@ -6151,7 +6241,7 @@
     if test $space = no; then
       # DEC Alpha running OSF/1
       echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
-echo "configure:6155: checking for 3-argument statfs function (DEC OSF/1)" >&5
+echo "configure:6245: checking for 3-argument statfs function (DEC OSF/1)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6159,7 +6249,7 @@
   fu_cv_sys_stat_statfs3_osf1=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6163 "configure"
+#line 6253 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -6172,7 +6262,7 @@
 	exit (statfs (".", &fsd, sizeof (struct statfs)));
       }
 EOF
-if { (eval echo configure:6176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs3_osf1=yes
 else
@@ -6199,7 +6289,7 @@
     if test $space = no; then
     # AIX
       echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
-echo "configure:6203: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+echo "configure:6293: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6207,7 +6297,7 @@
   fu_cv_sys_stat_statfs2_bsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6211 "configure"
+#line 6301 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_PARAM_H
@@ -6226,7 +6316,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_bsize=yes
 else
@@ -6253,7 +6343,7 @@
     if test $space = no; then
     # SVR3
       echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
-echo "configure:6257: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+echo "configure:6347: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6261,7 +6351,7 @@
   fu_cv_sys_stat_statfs4=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6265 "configure"
+#line 6355 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statfs.h>
@@ -6271,7 +6361,7 @@
       exit (statfs (".", &fsd, sizeof fsd, 0));
       }
 EOF
-if { (eval echo configure:6275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs4=yes
 else
@@ -6298,7 +6388,7 @@
     if test $space = no; then
     # 4.4BSD and NetBSD
       echo $ac_n "checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)""... $ac_c" 1>&6
-echo "configure:6302: checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)" >&5
+echo "configure:6392: checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6306,7 +6396,7 @@
   fu_cv_sys_stat_statfs2_fsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6310 "configure"
+#line 6400 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -6322,7 +6412,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_fsize=yes
 else
@@ -6349,7 +6439,7 @@
     if test $space = no; then
       # Ultrix
       echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
-echo "configure:6353: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+echo "configure:6443: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6357,7 +6447,7 @@
   fu_cv_sys_stat_fs_data=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6361 "configure"
+#line 6451 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6378,7 +6468,7 @@
       exit (statfs (".", &fsd) != 1);
       }
 EOF
-if { (eval echo configure:6382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_fs_data=yes
 else
@@ -6406,12 +6496,12 @@
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6410: checking for mode_t" >&5
+echo "configure:6500: 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 6415 "configure"
+#line 6505 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6439,12 +6529,12 @@
 fi
 
 echo $ac_n "checking for umode_t""... $ac_c" 1>&6
-echo "configure:6443: checking for umode_t" >&5
+echo "configure:6533: checking for umode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_umode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6448 "configure"
+#line 6538 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6472,12 +6562,12 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6476: checking for off_t" >&5
+echo "configure:6566: 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 6481 "configure"
+#line 6571 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6505,12 +6595,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6509: checking for pid_t" >&5
+echo "configure:6599: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6514 "configure"
+#line 6604 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6538,12 +6628,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6542: checking for uid_t in sys/types.h" >&5
+echo "configure:6632: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6547 "configure"
+#line 6637 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -6572,12 +6662,12 @@
 fi
 
 echo $ac_n "checking for nlink_t""... $ac_c" 1>&6
-echo "configure:6576: checking for nlink_t" >&5
+echo "configure:6666: checking for nlink_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_nlink_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6581 "configure"
+#line 6671 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6609,17 +6699,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6613: checking for $ac_hdr" >&5
+echo "configure:6703: 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 6618 "configure"
+#line 6708 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6713: \"$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*
@@ -6648,12 +6738,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6652: checking for $ac_func" >&5
+echo "configure:6742: 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 6657 "configure"
+#line 6747 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6676,7 +6766,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6770: \"$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
@@ -6701,7 +6791,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6705: checking for working mmap" >&5
+echo "configure:6795: 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
@@ -6709,7 +6799,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6713 "configure"
+#line 6803 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6849,7 +6939,7 @@
 }
 
 EOF
-if { (eval echo configure:6853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6943: \"$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
@@ -6874,19 +6964,19 @@
 # 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:6878: checking for working alloca.h" >&5
+echo "configure:6968: 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 6883 "configure"
+#line 6973 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6980: \"$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
@@ -6907,12 +6997,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6911: checking for alloca" >&5
+echo "configure:7001: 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 6916 "configure"
+#line 7006 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -6940,7 +7030,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:6944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7034: \"$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
@@ -6972,12 +7062,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6976: checking whether alloca needs Cray hooks" >&5
+echo "configure:7066: 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 6981 "configure"
+#line 7071 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7002,12 +7092,12 @@
 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:7006: checking for $ac_func" >&5
+echo "configure:7096: 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 7011 "configure"
+#line 7101 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7030,7 +7120,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7124: \"$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
@@ -7057,7 +7147,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7061: checking stack direction for C alloca" >&5
+echo "configure:7151: 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
@@ -7065,7 +7155,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 7069 "configure"
+#line 7159 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7084,7 +7174,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7178: \"$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
@@ -7112,7 +7202,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:7116: checking for X" >&5
+echo "configure:7206: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -7174,12 +7264,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 7178 "configure"
+#line 7268 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7273: \"$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*
@@ -7248,14 +7338,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7252 "configure"
+#line 7342 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:7259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -7361,17 +7451,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:7365: checking whether -R must be followed by a space" >&5
+echo "configure:7455: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 7368 "configure"
+#line 7458 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -7387,14 +7477,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 7391 "configure"
+#line 7481 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -7426,7 +7516,7 @@
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:7430: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7520: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7434,7 +7524,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7438 "configure"
+#line 7528 "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
@@ -7445,7 +7535,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7539: \"$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
@@ -7467,7 +7557,7 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:7471: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7561: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7475,7 +7565,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7479 "configure"
+#line 7569 "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
@@ -7486,7 +7576,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7580: \"$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
@@ -7515,12 +7605,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:7519: checking for gethostbyname" >&5
+echo "configure:7609: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7524 "configure"
+#line 7614 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -7543,7 +7633,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -7564,7 +7654,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7568: checking for gethostbyname in -lnsl" >&5
+echo "configure:7658: 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
@@ -7572,7 +7662,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7576 "configure"
+#line 7666 "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
@@ -7583,7 +7673,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7677: \"$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
@@ -7613,12 +7703,12 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:7617: checking for connect" >&5
+echo "configure:7707: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7622 "configure"
+#line 7712 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -7641,7 +7731,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -7662,7 +7752,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7666: checking for connect in -lsocket" >&5
+echo "configure:7756: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7670,7 +7760,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7674 "configure"
+#line 7764 "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
@@ -7681,7 +7771,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7775: \"$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
@@ -7705,12 +7795,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:7709: checking for remove" >&5
+echo "configure:7799: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7714 "configure"
+#line 7804 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -7733,7 +7823,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -7754,7 +7844,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7758: checking for remove in -lposix" >&5
+echo "configure:7848: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7762,7 +7852,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7766 "configure"
+#line 7856 "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
@@ -7773,7 +7863,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:7777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7867: \"$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
@@ -7797,12 +7887,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7801: checking for shmat" >&5
+echo "configure:7891: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7806 "configure"
+#line 7896 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -7825,7 +7915,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -7846,7 +7936,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7850: checking for shmat in -lipc" >&5
+echo "configure:7940: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7854,7 +7944,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7858 "configure"
+#line 7948 "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
@@ -7865,7 +7955,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:7869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7959: \"$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
@@ -7898,7 +7988,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:7902: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7992: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7906,7 +7996,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7910 "configure"
+#line 8000 "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
@@ -7917,7 +8007,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:7921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8011: \"$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
@@ -7967,7 +8057,7 @@
 
 
 echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:7971: checking for t_accept in -lnsl" >&5
+echo "configure:8061: checking for t_accept in -lnsl" >&5
 ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7975,7 +8065,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7979 "configure"
+#line 8069 "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
@@ -7986,7 +8076,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:7990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8080: \"$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
@@ -8014,7 +8104,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8018: checking for socket in -lsocket" >&5
+echo "configure:8108: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8022,7 +8112,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8026 "configure"
+#line 8116 "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
@@ -8033,7 +8123,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8127: \"$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
@@ -8065,12 +8155,12 @@
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8069: checking for $ac_func" >&5
+echo "configure:8159: 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 8074 "configure"
+#line 8164 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8093,7 +8183,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8187: \"$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
@@ -8121,7 +8211,7 @@
   # socket is not in the default libraries.  See if it's in some other.
   for lib in bsd socket inet; do
     echo $ac_n "checking for socket in -l$lib""... $ac_c" 1>&6
-echo "configure:8125: checking for socket in -l$lib" >&5
+echo "configure:8215: checking for socket in -l$lib" >&5
 ac_lib_var=`echo $lib'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8129,7 +8219,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8133 "configure"
+#line 8223 "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
@@ -8140,7 +8230,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8234: \"$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
@@ -8172,12 +8262,12 @@
 
 have_gethostbyname=no
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8176: checking for gethostbyname" >&5
+echo "configure:8266: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8181 "configure"
+#line 8271 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8200,7 +8290,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8223,7 +8313,7 @@
   # gethostbyname is not in the default libraries.  See if it's in some other.
   for lib in bsd socket inet; do
     echo $ac_n "checking for gethostbyname in -l$lib""... $ac_c" 1>&6
-echo "configure:8227: checking for gethostbyname in -l$lib" >&5
+echo "configure:8317: checking for gethostbyname in -l$lib" >&5
 ac_lib_var=`echo $lib'_'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
@@ -8231,7 +8321,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8235 "configure"
+#line 8325 "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
@@ -8242,7 +8332,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8336: \"$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
@@ -8268,12 +8358,12 @@
 for ac_func in socketpair
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8272: checking for $ac_func" >&5
+echo "configure:8362: 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 8277 "configure"
+#line 8367 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8296,7 +8386,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8390: \"$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
@@ -8322,7 +8412,7 @@
 
 
 echo $ac_n "checking for get_process_stats in -lseq""... $ac_c" 1>&6
-echo "configure:8326: checking for get_process_stats in -lseq" >&5
+echo "configure:8416: checking for get_process_stats in -lseq" >&5
 ac_lib_var=`echo seq'_'get_process_stats | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8330,7 +8420,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8334 "configure"
+#line 8424 "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
@@ -8341,7 +8431,7 @@
 get_process_stats()
 ; return 0; }
 EOF
-if { (eval echo configure:8345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8435: \"$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
@@ -8379,7 +8469,7 @@
 	case $use_vfs in
 		yes) 	
     echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:8383: checking for t_accept in -lnsl" >&5
+echo "configure:8473: checking for t_accept in -lnsl" >&5
 ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8387,7 +8477,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8391 "configure"
+#line 8481 "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
@@ -8398,7 +8488,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:8402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8492: \"$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
@@ -8426,7 +8516,7 @@
 fi
 
   echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8430: checking for socket in -lsocket" >&5
+echo "configure:8520: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8434,7 +8524,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8438 "configure"
+#line 8528 "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
@@ -8445,7 +8535,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8539: \"$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
@@ -8477,12 +8567,12 @@
   for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8481: checking for $ac_func" >&5
+echo "configure:8571: 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 8486 "configure"
+#line 8576 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8505,7 +8595,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8599: \"$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
@@ -8533,7 +8623,7 @@
     # socket is not in the default libraries.  See if it's in some other.
     for lib in bsd socket inet; do
       echo $ac_n "checking for socket in -l$lib""... $ac_c" 1>&6
-echo "configure:8537: checking for socket in -l$lib" >&5
+echo "configure:8627: checking for socket in -l$lib" >&5
 ac_lib_var=`echo $lib'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8541,7 +8631,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8545 "configure"
+#line 8635 "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
@@ -8552,7 +8642,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8646: \"$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
@@ -8584,12 +8674,12 @@
 
   have_gethostbyname=no
   echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8588: checking for gethostbyname" >&5
+echo "configure:8678: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8593 "configure"
+#line 8683 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8612,7 +8702,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8635,7 +8725,7 @@
     # gethostbyname is not in the default libraries.  See if it's in some other.
     for lib in bsd socket inet; do
       echo $ac_n "checking for gethostbyname in -l$lib""... $ac_c" 1>&6
-echo "configure:8639: checking for gethostbyname in -l$lib" >&5
+echo "configure:8729: checking for gethostbyname in -l$lib" >&5
 ac_lib_var=`echo $lib'_'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
@@ -8643,7 +8733,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8647 "configure"
+#line 8737 "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
@@ -8654,7 +8744,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8748: \"$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
@@ -8683,14 +8773,14 @@
       
 av_struct_linger=no
 echo $ac_n "checking struct linger is available""... $ac_c" 1>&6
-echo "configure:8687: checking struct linger is available" >&5
+echo "configure:8777: checking struct linger is available" >&5
 if test "$cross_compiling" = yes; then
   
 av_struct_linger=no
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8694 "configure"
+#line 8784 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8706,7 +8796,7 @@
 }
 
 EOF
-if { (eval echo configure:8710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 cat >> confdefs.h <<\EOF
@@ -8731,12 +8821,12 @@
       for ac_func in pmap_set
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8735: checking for $ac_func" >&5
+echo "configure:8825: 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 8740 "configure"
+#line 8830 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8759,7 +8849,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8853: \"$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
@@ -8781,7 +8871,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pmap_set in -lrpc""... $ac_c" 1>&6
-echo "configure:8785: checking for pmap_set in -lrpc" >&5
+echo "configure:8875: checking for pmap_set in -lrpc" >&5
 ac_lib_var=`echo rpc'_'pmap_set | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8789,7 +8879,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrpc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8793 "configure"
+#line 8883 "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
@@ -8800,7 +8890,7 @@
 pmap_set()
 ; return 0; }
 EOF
-if { (eval echo configure:8804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8894: \"$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
@@ -8832,12 +8922,12 @@
       for ac_func in pmap_getport pmap_getmaps rresvport
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8836: checking for $ac_func" >&5
+echo "configure:8926: 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 8841 "configure"
+#line 8931 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8860,7 +8950,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8954: \"$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
@@ -8888,17 +8978,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8892: checking for $ac_hdr" >&5
+echo "configure:8982: 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 8897 "configure"
+#line 8987 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8992: \"$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*
@@ -9162,7 +9252,7 @@
 else
   
 	echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6
-echo "configure:9166: checking for Gpm_Repeat in -lgpm" >&5
+echo "configure:9256: checking for Gpm_Repeat in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Repeat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9170,7 +9260,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9174 "configure"
+#line 9264 "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
@@ -9181,7 +9271,7 @@
 Gpm_Repeat()
 ; return 0; }
 EOF
-if { (eval echo configure:9185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9275: \"$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
@@ -9322,7 +9412,7 @@
 	    # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9326: checking for $ac_word" >&5
+echo "configure:9416: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9359,7 +9449,7 @@
 	      no_gnome_config="yes"
 	    else
 	      echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
-echo "configure:9363: checking if $GNOME_CONFIG works" >&5
+echo "configure:9453: checking if $GNOME_CONFIG works" >&5
 	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
 	        echo "$ac_t""yes" 1>&6
 	        
@@ -9367,7 +9457,7 @@
 	# Extract the first word of "orbit-config", so it can be a program name with args.
 set dummy orbit-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9371: checking for $ac_word" >&5
+echo "configure:9461: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9403,7 +9493,7 @@
 	# Extract the first word of "orbit-idl", so it can be a program name with args.
 set dummy orbit-idl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9407: checking for $ac_word" >&5
+echo "configure:9497: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_IDL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9437,7 +9527,7 @@
 fi
 
 	echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6
-echo "configure:9441: checking for working ORBit environment" >&5
+echo "configure:9531: checking for working ORBit environment" >&5
 if eval "test \"`echo '$''{'gnome_cv_orbit_found'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9473,7 +9563,7 @@
 	fi
 
 	echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6
-echo "configure:9477: checking for gnorba libraries" >&5
+echo "configure:9567: checking for gnorba libraries" >&5
 if eval "test \"`echo '$''{'gnome_cv_gnorba_found'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9548,7 +9638,7 @@
 	
 	    if test "$no_gnome_config" = "yes"; then
               echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:9552: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo "configure:9642: checking for gnomeConf.sh file in $gnome_prefix" >&5
 	      if test -f $gnome_prefix/gnomeConf.sh; then
 	        echo "$ac_t""found" 1>&6
 	        echo "loading gnome configuration from" \
@@ -9578,8 +9668,8 @@
 	if test -n ""; then
 	  n=""
 	  for i in $n; do
-	    echo $ac_n "checking extra library $i""... $ac_c" 1>&6
-echo "configure:9583: checking extra library $i" >&5
+	    echo $ac_n "checking extra library \"$i\"""... $ac_c" 1>&6
+echo "configure:9673: checking extra library \"$i\"" >&5
 	    case $i in 
 	      applets)
 		
@@ -9604,7 +9694,7 @@
 # Extract the first word of "nroff", so it can be a program name with args.
 set dummy nroff; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9608: checking for $ac_word" >&5
+echo "configure:9698: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_nroff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9633,7 +9723,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6
-echo "configure:9637: checking for manual formatting macros" >&5
+echo "configure:9727: checking for manual formatting macros" >&5
     if eval "test \"`echo '$''{'ac_cv_mandoc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9657,7 +9747,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6
-echo "configure:9661: checking If nroff accepts -Tascii" >&5
+echo "configure:9751: checking If nroff accepts -Tascii" >&5
     if eval "test \"`echo '$''{'ac_cv_nroff_tascii'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9681,7 +9771,7 @@
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9685: checking for $ac_word" >&5
+echo "configure:9775: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_FILECMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9710,7 +9800,7 @@
 
 if $HAVE_FILECMD; then
     echo $ac_n "checking for - option to file command""... $ac_c" 1>&6
-echo "configure:9714: checking for - option to file command" >&5
+echo "configure:9804: checking for - option to file command" >&5
     if eval "test \"`echo '$''{'ac_cv_filestdin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9753,7 +9843,7 @@
 
             
 echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6
-echo "configure:9757: checking for -L option to file command" >&5
+echo "configure:9847: checking for -L option to file command" >&5
 if eval "test \"`echo '$''{'ac_cv_filel'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9779,7 +9869,7 @@
 fi 
 
 echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6
-echo "configure:9783: checking for - option to grep command" >&5
+echo "configure:9873: checking for - option to grep command" >&5
 if eval "test \"`echo '$''{'ac_cv_grep_stdin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9803,7 +9893,7 @@
 
 
 echo $ac_n "checking for subshell support""... $ac_c" 1>&6
-echo "configure:9807: checking for subshell support" >&5
+echo "configure:9897: checking for subshell support" >&5
 # Check whether --with-subshell or --without-subshell was given.
 if test "${with_subshell+set}" = set; then
   withval="$with_subshell"
@@ -9945,7 +10035,7 @@
 slang_term=""
 slang_use_system_installed_lib=false
 echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6
-echo "configure:9949: checking for SLang_init_tty in -lslang" >&5
+echo "configure:10039: checking for SLang_init_tty in -lslang" >&5
 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9953,7 +10043,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9957 "configure"
+#line 10047 "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
@@ -9964,7 +10054,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:9968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10058: \"$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
@@ -9983,17 +10073,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9987: checking for $ac_hdr" >&5
+echo "configure:10077: 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 9992 "configure"
+#line 10082 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10087: \"$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*
@@ -10028,17 +10118,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10032: checking for $ac_hdr" >&5
+echo "configure:10122: 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 10037 "configure"
+#line 10127 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10132: \"$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*
@@ -10110,7 +10200,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10114: checking for tgoto in -ltermcap" >&5
+echo "configure:10204: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10118,7 +10208,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10122 "configure"
+#line 10212 "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
@@ -10129,7 +10219,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10223: \"$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
@@ -10202,7 +10292,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 10206 "configure"
+#line 10296 "configure"
 #include "confdefs.h"
  
 	    #ifdef SLANG_H_INSIDE_SLANG_DIR
@@ -10216,7 +10306,7 @@
 		return 0;
 	    } 
 EOF
-if { (eval echo configure:10220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF
 #define SLANG_TERMINFO 1
@@ -10235,7 +10325,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10239: checking for tgoto in -ltermcap" >&5
+echo "configure:10329: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10243,7 +10333,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10247 "configure"
+#line 10337 "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
@@ -10254,7 +10344,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10348: \"$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
@@ -10319,7 +10409,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10323: checking for tgoto in -ltermcap" >&5
+echo "configure:10413: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10327,7 +10417,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10331 "configure"
+#line 10421 "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
@@ -10338,7 +10428,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10432: \"$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
@@ -10453,17 +10543,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10457: checking for $ac_hdr" >&5
+echo "configure:10547: 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 10462 "configure"
+#line 10552 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10557: \"$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*
@@ -10516,7 +10606,7 @@
 	fi
 else
   	echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6
-echo "configure:10520: checking for ext2fs_close in -lext2fs" >&5
+echo "configure:10610: checking for ext2fs_close in -lext2fs" >&5
 ac_lib_var=`echo ext2fs'_'ext2fs_close | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10524,7 +10614,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lext2fs  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10528 "configure"
+#line 10618 "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
@@ -10535,7 +10625,7 @@
 ext2fs_close()
 ; return 0; }
 EOF
-if { (eval echo configure:10539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10629: \"$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
@@ -10556,17 +10646,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10560: checking for $ac_hdr" >&5
+echo "configure:10650: 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 10565 "configure"
+#line 10655 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10660: \"$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*
@@ -10632,7 +10722,7 @@
 if $search_ncurses
 then
     echo "checking "location of ncurses.h file"" 1>&6
-echo "configure:10636: checking "location of ncurses.h file"" >&5
+echo "configure:10726: checking "location of ncurses.h file"" >&5
 
     
     if $search_ncurses
@@ -10772,7 +10862,7 @@
                 if $search_ncurses 
     then
         cat > conftest.$ac_ext <<EOF
-#line 10776 "configure"
+#line 10866 "configure"
 #include "confdefs.h"
 #include </usr/include/curses.h>
 EOF
@@ -10798,7 +10888,7 @@
 rm -f conftest*
 
 	cat > conftest.$ac_ext <<EOF
-#line 10802 "configure"
+#line 10892 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -10858,10 +10948,10 @@
     else
         # check for ncurses version, to properly ifdef mouse-fix
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10862: checking for ncurses version" >&5
+echo "configure:10952: checking for ncurses version" >&5
 	ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 10865 "configure"
+#line 10955 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>
@@ -10905,12 +10995,12 @@
 for ac_func in resizeterm keyok
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10909: checking for $ac_func" >&5
+echo "configure:10999: 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 10914 "configure"
+#line 11004 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10933,7 +11023,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11027: \"$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
@@ -10982,7 +11072,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 10986 "configure"
+#line 11076 "configure"
 #include "confdefs.h"
  
 	    #ifdef SLANG_H_INSIDE_SLANG_DIR
@@ -10996,7 +11086,7 @@
 		return 0;
 	    } 
 EOF
-if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF
 #define SLANG_TERMINFO 1
@@ -11015,7 +11105,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:11019: checking for tgoto in -ltermcap" >&5
+echo "configure:11109: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11023,7 +11113,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11027 "configure"
+#line 11117 "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
@@ -11034,7 +11124,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:11038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11128: \"$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
@@ -11099,7 +11189,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:11103: checking for tgoto in -ltermcap" >&5
+echo "configure:11193: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11107,7 +11197,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11111 "configure"
+#line 11201 "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
@@ -11118,7 +11208,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:11122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11212: \"$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
@@ -11158,7 +11248,7 @@
     install_saver="yes"
 
                 echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:11162: checking for pam_start in -lpam" >&5
+echo "configure:11252: checking for pam_start in -lpam" >&5
 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11166,7 +11256,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpam -ldl $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11170 "configure"
+#line 11260 "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
@@ -11177,7 +11267,7 @@
 pam_start()
 ; return 0; }
 EOF
-if { (eval echo configure:11181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11271: \"$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
@@ -11220,7 +11310,7 @@
 else
     
 echo $ac_n "checking for -lXpm""... $ac_c" 1>&6
-echo "configure:11224: checking for -lXpm" >&5
+echo "configure:11314: checking for -lXpm" >&5
 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11236,7 +11326,7 @@
 	has_xpm_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 11240 "configure"
+#line 11330 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11246,7 +11336,7 @@
 XpmLibraryVersion();
 ; return 0; }
 EOF
-if { (eval echo configure:11250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_has_xpm=yes
 else
@@ -11268,7 +11358,7 @@
 	
 	
 echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6
-echo "configure:11272: checking for X11 non-rectangular shape extension" >&5
+echo "configure:11362: checking for X11 non-rectangular shape extension" >&5
 if eval "test \"`echo '$''{'ac_cv_has_shape'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11284,7 +11374,7 @@
 	has_shape_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 11288 "configure"
+#line 11378 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11299,7 +11389,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_has_shape=yes
 else
@@ -11335,7 +11425,7 @@
 			echo
 		else
 		echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6
-echo "configure:11339: checking for setupterm in -lcurses" >&5
+echo "configure:11429: checking for setupterm in -lcurses" >&5
 ac_lib_var=`echo curses'_'setupterm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11343,7 +11433,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11347 "configure"
+#line 11437 "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
@@ -11354,7 +11444,7 @@
 setupterm()
 ; return 0; }
 EOF
-if { (eval echo configure:11358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11448: \"$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
@@ -11371,7 +11461,7 @@
   echo "$ac_t""yes" 1>&6
   
 			cat > conftest.$ac_ext <<EOF
-#line 11375 "configure"
+#line 11465 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -11384,7 +11474,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			LIBS="$LIBS -lcurses"
@@ -11623,6 +11713,21 @@
 s%@mandir@%$mandir%g
 s%@VERSION@%$VERSION%g
 s%@PACKAGE@%$PACKAGE%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
diff -ruN old/mc-4.5.34/configure.in new/mc-4.5.35/configure.in
--- old/mc-4.5.34/configure.in	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/configure.in	Mon Jul  5 21:18:55 1999
@@ -5,11 +5,13 @@
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.34
+VERSION=4.5.35
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
+
+AC_CANONICAL_SYSTEM
 
 dnl This is path where we're looking for headers in addition to /usr/include
 dnl and whatever cpp defaults to.
diff -ruN old/mc-4.5.34/gnome/application.x-gnumeric.desktop new/mc-4.5.35/gnome/application.x-gnumeric.desktop
--- old/mc-4.5.34/gnome/application.x-gnumeric.desktop	Sun Jul  4 13:27:08 1999
+++ new/mc-4.5.35/gnome/application.x-gnumeric.desktop	Mon Jul  5 21:18:57 1999
@@ -2,9 +2,11 @@
 Name=Spreadsheet
 Name[es]=Hoja de cálculo
 Name[fr]=Tableur
+Name[no]=Regneark
 Comment=Create a new spreadsheet
 Comment[es]=Crea una nueva hoja de cálculo
 Comment[fr]=Crée une nouvelle feuille de calcul
+Comment[no]=Opprett et nytt regneark
 TryExec=gnumeric
 Exec=gnumeric
 Icon=gnome-gnumeric.png
diff -ruN old/mc-4.5.34/gnome/gimp.image.desktop new/mc-4.5.35/gnome/gimp.image.desktop
--- old/mc-4.5.34/gnome/gimp.image.desktop	Sun Jul  4 13:27:08 1999
+++ new/mc-4.5.35/gnome/gimp.image.desktop	Mon Jul  5 21:18:57 1999
@@ -4,12 +4,14 @@
 Name[de]=Grafik
 Name[es]=Imagen
 Name[fr]=Image
+Name[no]=Bilde
 Name[wa]=Imådje
 Comment=Create a new Image
 Comment[ca]=Crea una nova imatge
 Comment[de]=Eine neue Grafik erzeugen
 Comment[es]=Crear una imagen
 Comment[fr]=Créer une image
+Comment[no]=Lag et nytt bilde
 Comment[wa]=Fé ene novele imådje
 TryExec=gimp
 Exec=gimp
diff -ruN old/mc-4.5.34/lib/mc.hint new/mc-4.5.35/lib/mc.hint
--- old/mc-4.5.34/lib/mc.hint	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/lib/mc.hint	Mon Jul  5 21:18:56 1999
@@ -8,9 +8,9 @@
 Hint: Selecting directories: add a slash to the end of the matching pattern.
 Hint: If your terminal lacks functions keys, use the ESC+number sequence.
 Hint: There is a Midnight Commander URL: http://www.gnome.org/mc/
-Hint: The latest version of the Commander is in: ftp://prep.ai.mit.edu/pub/gnu/
+Hint: The latest version of the Commander is in: ftp://ftp.gnome.org/pub/GNOME/sources/mc
 Hint: Please send any bug reports to mc-bugs@nuclecu.unam.mx
-Hint: Midnight Commander home site: ftp://ftp.nuclecu.unam.mx/linux/local/
+Hint: Midnight Commander home site: http://www.gnome.org/mc
 Hint: Tab changes your current panel.
 Hint: VFS coolness: tap enter on a tar file to examine its contents.
 Hint: We also have a nice manual page.
diff -ruN old/mc-4.5.34/macros/gnome.m4 new/mc-4.5.35/macros/gnome.m4
--- old/mc-4.5.34/macros/gnome.m4	Sun Jul  4 13:27:08 1999
+++ new/mc-4.5.35/macros/gnome.m4	Mon Jul  5 21:18:58 1999
@@ -98,7 +98,7 @@
 	if test -n "$3"; then
 	  n="$3"
 	  for i in $n; do
-	    AC_MSG_CHECKING(extra library $i)
+	    AC_MSG_CHECKING(extra library \"$i\")
 	    case $i in 
 	      applets)
 		AC_SUBST(GNOME_APPLETS_LIBS)
diff -ruN old/mc-4.5.34/mc.spec new/mc-4.5.35/mc.spec
--- old/mc-4.5.34/mc.spec	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/mc.spec	Mon Jul  5 21:18:55 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver     4.5.34
+%define ver     4.5.35
 %define rel     1
 %define prefix  /usr
 
@@ -41,7 +41,7 @@
 Midnight file system (currently, only the Midnight Commander file manager).
 
 %prep
-%setup
+%setup -q
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
diff -ruN old/mc-4.5.34/mc.spec.in new/mc-4.5.35/mc.spec.in
--- old/mc-4.5.34/mc.spec.in	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/mc.spec.in	Mon Jul  5 21:18:55 1999
@@ -41,7 +41,7 @@
 Midnight file system (currently, only the Midnight Commander file manager).
 
 %prep
-%setup
+%setup -q
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
Binary files old/mc-4.5.34/po/no.gmo and new/mc-4.5.35/po/no.gmo differ
diff -ruN old/mc-4.5.34/po/no.po new/mc-4.5.35/po/no.po
--- old/mc-4.5.34/po/no.po	Sun Jul  4 13:27:08 1999
+++ new/mc-4.5.35/po/no.po	Mon Jul  5 21:19:00 1999
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.34\n"
-"POT-Creation-Date: 1999-07-01 01:00+0200\n"
-"PO-Revision-Date: 1999-06-21 23:06+0200\n"
+"POT-Creation-Date: 1999-07-02 02:14+0200\n"
+"PO-Revision-Date: 1999-07-04 10:33+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@
 msgstr "Sett filter"
 
 #: gnome/gcmd.c:667 gnome/gcmd.c:708 gnome/gcmd.c:713 gnome/gcmd.c:717
-#: gnome/gscreen.c:2561
+#: gnome/gscreen.c:2403
 msgid "Show all files"
 msgstr "Vis alle filer"
 
@@ -675,7 +675,7 @@
 "Trykk OK for å terminere applikasjonen, eller avbryt for å fortsette."
 
 #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:384 gnome/gscreen.c:2230
+#: gnome/glayout.c:384 gnome/gscreen.c:2072
 msgid "_Copy..."
 msgstr "Kopier..."
 
@@ -683,7 +683,7 @@
 msgid "Copy files"
 msgstr "Kopier filer"
 
-#: gnome/glayout.c:385 gnome/gscreen.c:2231
+#: gnome/glayout.c:385 gnome/gscreen.c:2073
 msgid "_Delete..."
 msgstr "Slett..."
 
@@ -691,7 +691,7 @@
 msgid "Delete files"
 msgstr "Slett filer"
 
-#: gnome/glayout.c:386 gnome/gscreen.c:2232
+#: gnome/glayout.c:386 gnome/gscreen.c:2074
 msgid "_Move..."
 msgstr "Flytt..."
 
@@ -836,7 +836,7 @@
 msgid "File/New/Directory..."
 msgstr "Fil/Ny/Katalog..."
 
-#: gnome/gmain.c:558
+#: gnome/gmain.c:551
 msgid ""
 "You are running the GNOME File Manager as root.\n"
 "\n"
@@ -1308,146 +1308,78 @@
 msgid "Creates a new directory here"
 msgstr "Oppretter en ny katalog her"
 
-#: gnome/gscreen.c:1628
-msgid "All files"
-msgstr "Alle filer"
-
 #: gnome/gscreen.c:1630
-msgid "Archives and compressed files"
-msgstr "Arkiver og komprimerte filer"
-
-#: gnome/gscreen.c:1632
-msgid "RPM/DEB files"
-msgstr "RPM/DEB filer"
-
-#: gnome/gscreen.c:1634
-msgid "Text/Document files"
-msgstr "Tekst-/dokumentfiler"
-
-#: gnome/gscreen.c:1636
-msgid "HTML and SGML files"
-msgstr "HTML- og SGML-filer"
-
-#: gnome/gscreen.c:1638
-msgid "Postscript and PDF files"
-msgstr "Postscript- of PDF-filer"
-
-#: gnome/gscreen.c:1640
-msgid "Spreadsheet files"
-msgstr "Regnearkfiler"
-
-#: gnome/gscreen.c:1642
-msgid "Image files"
-msgstr "Bildefiler"
-
-#: gnome/gscreen.c:1645
-msgid "Video/animation files"
-msgstr "Video-/animasjonsfiler"
-
-#: gnome/gscreen.c:1647
-msgid "Audio files"
-msgstr "Lydfiler"
-
-#: gnome/gscreen.c:1649
-msgid "C program files"
-msgstr "C programfiler"
-
-#: gnome/gscreen.c:1651
-msgid "C++ program files"
-msgstr "C++ programfiler"
-
-#: gnome/gscreen.c:1653
-msgid "Objective-C program files"
-msgstr "Objektiv-C programfiler"
-
-#: gnome/gscreen.c:1655
-msgid "Scheme program files"
-msgstr "Scheme programfiler"
-
-#: gnome/gscreen.c:1657
-msgid "Assembler program files"
-msgstr "Assembler programfiler"
-
-#: gnome/gscreen.c:1659
-msgid "Misc. program files"
-msgstr "Forskj. programfiler"
-
-#: gnome/gscreen.c:1661
-msgid "Font files"
-msgstr "Skrifttypefiler"
-
-#: gnome/gscreen.c:1788
 #, c-format
 msgid "Search: %s"
 msgstr "Søk: %s"
 
-#: gnome/gscreen.c:1798
+#: gnome/gscreen.c:1640
 #, c-format
 msgid "%s bytes in %d file"
 msgstr "%s bytes i %d fil"
 
-#: gnome/gscreen.c:1798
+#: gnome/gscreen.c:1640
 #, c-format
 msgid "%s bytes in %d files"
 msgstr "%s bytes i %d filer"
 
-#: gnome/gscreen.c:1824 src/screen.c:670
+#: gnome/gscreen.c:1666 src/screen.c:670
 msgid "<readlink failed>"
 msgstr "<readlink feilet>"
 
-#: gnome/gscreen.c:2230
+#: gnome/gscreen.c:2072
 msgid "Copy directory"
 msgstr "Kopier katalog"
 
-#: gnome/gscreen.c:2231
+#: gnome/gscreen.c:2073
 msgid "Delete directory"
 msgstr "Slett katalog"
 
-#: gnome/gscreen.c:2232
+#: gnome/gscreen.c:2074
 msgid "Rename or move directory"
 msgstr "Omdøp eller flytt katalog"
 
-#: gnome/gscreen.c:2388
+#: gnome/gscreen.c:2230
 msgid "Back"
 msgstr "Tilbake"
 
-#: gnome/gscreen.c:2388
+#: gnome/gscreen.c:2230
 msgid "Go to the previously visited directory"
 msgstr "Gå til tidligere vist katalog"
 
-#: gnome/gscreen.c:2390
+#: gnome/gscreen.c:2232
 msgid "Up"
 msgstr "Opp"
 
-#: gnome/gscreen.c:2390
+#: gnome/gscreen.c:2232
 msgid "Go up a level in the directory heirarchy"
 msgstr "Gå opp ett nivå i kataloghierarkiet"
 
-#: gnome/gscreen.c:2392
+#: gnome/gscreen.c:2234
 msgid "Forward"
 msgstr "Fram"
 
-#: gnome/gscreen.c:2392
+#: gnome/gscreen.c:2234
 msgid "Go to the next directory"
 msgstr "Gå til neste katalog"
 
-#: gnome/gscreen.c:2395 src/tree.c:1011
+#: gnome/gscreen.c:2237 src/tree.c:1011
 msgid "Rescan"
 msgstr "Oppdater"
 
-#: gnome/gscreen.c:2395
+#: gnome/gscreen.c:2237
 msgid "Rescan the current directory"
 msgstr "Oppdater aktiv katalog"
 
-#: gnome/gscreen.c:2398
+#: gnome/gscreen.c:2240
 msgid "Home"
 msgstr "Hjem"
 
-#: gnome/gscreen.c:2398
+#: gnome/gscreen.c:2240
 msgid "Go to your home directory"
 msgstr "Gå til din hjemmekatalog"
 
-#: gnome/gscreen.c:2539
+#: gnome/gscreen.c:2381
 msgid "Location:"
 msgstr "Plassering:"
 
Binary files old/mc-4.5.34/po/wa.gmo and new/mc-4.5.35/po/wa.gmo differ
diff -ruN old/mc-4.5.34/po/wa.po new/mc-4.5.35/po/wa.po
--- old/mc-4.5.34/po/wa.po	Sun Jul  4 13:27:08 1999
+++ new/mc-4.5.35/po/wa.po	Mon Jul  5 21:19:00 1999
@@ -17,6 +17,7 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+
 #: edit/edit_key_translator.c:121
 msgid " Emacs key: "
 msgstr " Tape di Emacs: "
@@ -29,7 +30,7 @@
 #: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
 #: gtkedit/editcmd.c:706 gtkedit/editcmd.c:715
 msgid " Press macro hotkey: "
-msgstr " Tchôkî sol Tchôde Tape pol Macro: "
+msgstr " Tchôkî sol Tape Rascoûrti pol Macro: "
 
 #: edit/edit_key_translator.c:144
 msgid " Insert Literal "
@@ -49,7 +50,7 @@
 
 #: gnome/gcmd.c:111
 msgid "bug reports: http://bugs.gnome.org, or use gnome-bug"
-msgstr "rapoirter les bugs a: http://bugs.gnome.org, ou eployoz gnome-bug"
+msgstr "rapoirter les bugs a: http://bugs.gnome.org, ou eployîz gnome-bug"
 
 #: gnome/gcmd.c:123
 msgid "GNU Midnight Commander"
@@ -57,7 +58,7 @@
 
 #: gnome/gcmd.c:126
 msgid "The GNOME edition of the Midnight Commander file manager."
-msgstr "Li modeye GNOME do manaedjeu di fitchî Midnight Commander."
+msgstr "Li modeye GNOME do manaedjeu di fitchîs Midnight Commander."
 
 #: gnome/gcmd.c:261
 msgid "Sort By"
@@ -230,11 +231,11 @@
 #: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
 #: src/screen.c:409
 msgid "Group"
-msgstr "Groupe"
+msgstr "Hopê"
 
 #: gnome/gcustom-layout.c:39
 msgid "Group ID"
-msgstr "ID do groupe"
+msgstr "ID do hopê"
 
 #: gnome/gcustom-layout.c:40
 msgid "Inode Number"
@@ -717,7 +718,7 @@
 
 #: gnome/glayout.c:397
 msgid "Select a group of files"
-msgstr "Tchwezi on groupe di fitchîs"
+msgstr "Tchwezi on hopê di fitchîs"
 
 #: gnome/glayout.c:398
 msgid "_Invert Selection"
@@ -749,15 +750,15 @@
 
 #: gnome/glayout.c:410
 msgid "Confirmation settings"
-msgstr ""
+msgstr "Racertinaedje di l' apontiaedje"
 
 #: gnome/glayout.c:411
 msgid "_Filter View..."
-msgstr ""
+msgstr "Vey _Passete..."
 
 #: gnome/glayout.c:411
 msgid "Global option settings"
-msgstr ""
+msgstr "Apontiaedje globå"
 
 #: gnome/glayout.c:418
 msgid "_Find File..."
@@ -794,11 +795,11 @@
 
 #: gnome/glayout.c:435
 msgid "_Background jobs..."
-msgstr "_Bouyes di fonds..."
+msgstr "_Bezognes di fonds..."
 
 #: gnome/glayout.c:435
 msgid "List of background operations"
-msgstr "Djîveye des bouyes di fond"
+msgstr "Djîveye des bezognes di fond"
 
 #: gnome/glayout.c:438
 msgid "Exit"
@@ -806,7 +807,7 @@
 
 #: gnome/glayout.c:438
 msgid "Terminates the file manager and the desktop"
-msgstr "Arester li manaedjeu di fitchî eyèt li scribanne"
+msgstr "Arester li manaedjeu di fitchîs eyèt li scribanne"
 
 #: gnome/glayout.c:453
 msgid "Rescan System Devices"
@@ -992,193 +993,193 @@
 
 #: gnome/gnome-file-property-dialog.c:616
 msgid "Open action"
-msgstr ""
+msgstr "Drovaedje"
 
 #: gnome/gnome-file-property-dialog.c:617
 msgid "Needs terminal to run"
-msgstr ""
+msgstr "Ni s' sait enonder ki dins on terminå"
 
 #: gnome/gnome-file-property-dialog.c:742
 msgid "File Permissions"
-msgstr ""
+msgstr "Permissions pol fitchî"
 
 #: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259
 msgid "Current mode: "
-msgstr ""
+msgstr "Môde do moumint: "
 
 #. Headings
 #: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272
 msgid "Read"
-msgstr ""
+msgstr "Lére"
 
 #: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273
 msgid "Write"
-msgstr ""
+msgstr "Sicrire"
 
 #: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274
 msgid "Exec"
-msgstr ""
+msgstr "Enonder"
 
 #: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275
 msgid "Special"
-msgstr ""
+msgstr "Spéciå"
 
 #. Permissions
 #: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279
 msgid "User"
-msgstr ""
+msgstr "Ûzeu"
 
 #: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281
 msgid "Other"
-msgstr ""
+msgstr "Ôte"
 
 #. Special
 #: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285
 msgid "Set UID"
-msgstr ""
+msgstr "Mete UID"
 
 #: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286
 msgid "Set GID"
-msgstr ""
+msgstr "Mete GID"
 
 #: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287
 msgid "Sticky"
-msgstr ""
+msgstr "Aclapé"
 
 #: gnome/gnome-file-property-dialog.c:914
 msgid "File ownership"
-msgstr ""
+msgstr "Da kî li fitchî"
 
 #: gnome/gnome-file-property-dialog.c:1074
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: gnome/gnome-file-property-dialog.c:1077
 msgid "Statistics"
-msgstr ""
+msgstr "Statistikes"
 
 #: gnome/gnome-file-property-dialog.c:1083
 msgid "Options"
-msgstr ""
+msgstr "Tchûzes"
 
 #: gnome/gnome-file-property-dialog.c:1086
 msgid "Permissions"
-msgstr ""
+msgstr "Permissions"
 
 #: gnome/gnome-file-property-dialog.c:1089
 msgid " Properties"
-msgstr ""
+msgstr " Prôpietés"
 
 #: gnome/gnome-file-property-dialog.c:1140
 msgid "You entered an invalid username"
-msgstr ""
+msgstr "Ci no d' ûzeu la n' est nén valåbe"
 
 #: gnome/gnome-file-property-dialog.c:1185
 msgid "You must rename your file to something"
-msgstr ""
+msgstr "Vos dvoz rlomer vosse fitchî"
 
 #: gnome/gnome-file-property-dialog.c:1191
 msgid "You cannot rename a file to something containing a '/' character"
-msgstr ""
+msgstr "I n' pout gn avu nou '/' dvins li novea no di vosse fitchî"
 
 #. the first label
 #: gnome/gnome-open-dialog.c:383
 msgid "Select an application to open \""
-msgstr ""
+msgstr "Tchwezixhoz on programe a drovi \""
 
 #: gnome/gnome-open-dialog.c:394
 msgid "Select a file to run with"
-msgstr ""
+msgstr "Tchwezixhoz on fitchî a enonder"
 
 #. the file tree
 #: gnome/gnome-open-dialog.c:405
 msgid "Applications"
-msgstr ""
+msgstr "Programes"
 
 #: gnome/gnome-open-dialog.c:421
 msgid "Program to run"
-msgstr ""
+msgstr "Programe a-z enonder"
 
 #: gnome/gpopup2.c:188
 msgid "Mount device"
-msgstr ""
+msgstr "Monter l' éndjin"
 
 #: gnome/gpopup2.c:189
 msgid "Unmount device"
-msgstr ""
+msgstr "Dismonter l' éndjin"
 
 #: gnome/gpopup2.c:190
 msgid "Eject device"
-msgstr ""
+msgstr "Tchessî l' éndjin foû"
 
 #: gnome/gpopup2.c:193
 msgid "Open with..."
-msgstr ""
+msgstr "Drovi avou..."
 
 #: gnome/gpopup2.c:195
 msgid "View Unfiltered"
-msgstr ""
+msgstr "Vey sins passete"
 
 #: gnome/gpopup2.c:198
 msgid "Copy..."
-msgstr ""
+msgstr "Copyî..."
 
 #: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2368
 #: src/screen.c:2398
 msgid "Delete"
-msgstr ""
+msgstr "Disfacer"
 
 #: gnome/gpopup2.c:200
 msgid "Move..."
-msgstr ""
+msgstr "Bodjî..."
 
 #: gnome/gpopup2.c:201
 msgid "Hard Link..."
-msgstr ""
+msgstr "Deur Loyén..."
 
 #: gnome/gpopup2.c:202
 msgid "Symlink..."
-msgstr ""
+msgstr "Loyén Simbolike..."
 
 #: gnome/gpopup2.c:203
 msgid "Edit Symlink..."
-msgstr ""
+msgstr "Candjî Loyén Simbolike..."
 
 #: gnome/gpopup2.c:205
 msgid "Properties..."
-msgstr ""
+msgstr "Prôpietés..."
 
 #: gnome/gprefs.c:88
 msgid "Show backup files"
-msgstr ""
+msgstr "Mostrer les copeyes di såvrité"
 
 #: gnome/gprefs.c:92
 msgid "Show hidden files"
-msgstr ""
+msgstr "Mostrer les fitchîs catchîs"
 
 #: gnome/gprefs.c:96
 msgid "Mix files and directories"
-msgstr ""
+msgstr "Maxhî fitchîs èt ridants"
 
 #: gnome/gprefs.c:100
 msgid "Use shell patterns instead of regular expressions"
-msgstr ""
+msgstr "Eployî les modeles do shell estô des erûleyès ratoûrneures"
 
 #: gnome/gprefs.c:109
 msgid "Confirm when deleting file"
-msgstr ""
+msgstr "Racertiner cwand c' est ki vos disfacez des fitchîs"
 
 #: gnome/gprefs.c:113
 msgid "Confirm when overwriting files"
-msgstr ""
+msgstr "Racertiner cwand c' est ki vos spotchîz des fitchîs"
 
 #: gnome/gprefs.c:117
 msgid "Confirm when executing files"
-msgstr ""
+msgstr "Racertiner cwand c' est ki vos enondez des fitchîs"
 
 #: gnome/gprefs.c:121
 msgid "Show progress while operations are being performed"
-msgstr ""
+msgstr "Mostrer l' avançmint a fait ki l' ovraedje si fwait"
 
 #: gnome/gprefs.c:130
 msgid "VFS Timeout:"
@@ -1186,23 +1187,23 @@
 
 #: gnome/gprefs.c:131 gnome/gprefs.c:156
 msgid "Seconds"
-msgstr ""
+msgstr "Segondes"
 
 #: gnome/gprefs.c:134
 msgid "Anonymous FTP password:"
-msgstr ""
+msgstr "Secret po FTP anonime:"
 
 #: gnome/gprefs.c:138
 msgid "Always use FTP proxy"
-msgstr ""
+msgstr "Tofer eployî on proxy FTP"
 
 #: gnome/gprefs.c:147
 msgid "Fast directory reload"
-msgstr ""
+msgstr "Ritcherdjî les ridants abeye"
 
 #: gnome/gprefs.c:151
 msgid "Compute totals before copying files"
-msgstr ""
+msgstr "Cârculer les totås dvant do copyî les fitchîs"
 
 #: gnome/gprefs.c:155
 msgid "FTP directory cache timeout :"
@@ -1210,178 +1211,178 @@
 
 #: gnome/gprefs.c:159
 msgid "Allow customization of icons in icon view"
-msgstr ""
+msgstr "Leyî amîdrer les imådjetes a s' môde cwand les fitchîs sont prezintés a imådjetes"
 
 #: gnome/gprefs.c:167
 msgid "Use shaped icons"
-msgstr ""
+msgstr "Eployî des imådjetes di totes les cognes"
 
 #: gnome/gprefs.c:171
 msgid "Auto place icons"
-msgstr ""
+msgstr "Arindjî les imådjetes tot seu"
 
 #: gnome/gprefs.c:175
 msgid "Snap icons to grid"
-msgstr ""
+msgstr "Claper les imådjetes so ene grile"
 
 #: gnome/gprefs.c:184
 msgid "File display"
-msgstr ""
+msgstr "Håynaedje des fitchîs"
 
 #: gnome/gprefs.c:188
 msgid "Confirmation"
-msgstr ""
+msgstr "Racertinaedje"
 
 #: gnome/gprefs.c:192
 msgid "VFS"
-msgstr ""
+msgstr "VFS"
 
 #: gnome/gprefs.c:196
 msgid "Caching"
-msgstr ""
+msgstr "Muchaedje"
 
 #: gnome/gprefs.c:200
 msgid "Desktop"
-msgstr ""
+msgstr "Scribanne"
 
 #: gnome/gprefs.c:479
 msgid "Preferences"
-msgstr ""
+msgstr "Preferinces"
 
 #: gnome/gprop.c:58 gnome/gprop.c:75
 msgid "Filename"
-msgstr ""
+msgstr "No do fitchî"
 
 #: gnome/gprop.c:67
 msgid "Full name: "
-msgstr ""
+msgstr "No etir: "
 
 #: gnome/gprop.c:109 src/panelize.c:205
 msgid "Command"
-msgstr ""
+msgstr "Comande"
 
 #: gnome/gprop.c:119
 msgid "Command:"
-msgstr ""
+msgstr "Comande:"
 
 #: gnome/gprop.c:129
 msgid "Use terminal"
-msgstr ""
+msgstr "Eployî on terminå"
 
 #: gnome/gprop.c:248
 msgid "File mode (permissions)"
-msgstr ""
+msgstr "Môde des fitchîs (permissions)"
 
 #: gnome/gprop.c:321 gnome/gprop.c:347
 msgid "<Unknown>"
-msgstr ""
+msgstr "<Nén cnoxhu>"
 
 #: gnome/gprop.c:494
 msgid "General"
-msgstr ""
+msgstr "Djenerå"
 
 #: gnome/gprop.c:505
 msgid "Title"
-msgstr ""
+msgstr "Tite"
 
 #: gnome/gprop.c:535
 msgid "Select icon"
-msgstr ""
+msgstr "Tchwezi ene imådjete"
 
 #: gnome/gscreen.c:1447
 msgid "Reloads the current directory"
-msgstr ""
+msgstr "Ritcherdjî li ridant do moumint"
 
 #: gnome/gscreen.c:1449
 msgid "New _Directory..."
-msgstr ""
+msgstr "Novea _Ridant..."
 
 #: gnome/gscreen.c:1449
 msgid "Creates a new directory here"
-msgstr ""
+msgstr "Fé on novea ridant droci"
 
 #: gnome/gscreen.c:1630
 msgid "All files"
-msgstr ""
+msgstr "Tos les fitchîs"
 
 #: gnome/gscreen.c:1632
 msgid "Archives and compressed files"
-msgstr ""
+msgstr "Fitchîs rindjîs eyèt rastrindus"
 
 #: gnome/gscreen.c:1634
 msgid "RPM/DEB files"
-msgstr ""
+msgstr "Fitchîs RPM/DEB"
 
 #: gnome/gscreen.c:1636
 msgid "Text/Document files"
-msgstr ""
+msgstr "Fitchîs texes/documints"
 
 #: gnome/gscreen.c:1638
 msgid "HTML and SGML files"
-msgstr ""
+msgstr "Fitchîs HTML eyèt SGML"
 
 #: gnome/gscreen.c:1640
 msgid "Postscript and PDF files"
-msgstr ""
+msgstr "Fitchîs postscript eyèt PDF"
 
 #: gnome/gscreen.c:1642
 msgid "Spreadsheet files"
-msgstr ""
+msgstr "Fitchîs di tåvleu"
 
 #: gnome/gscreen.c:1644
 msgid "Image files"
-msgstr ""
+msgstr "Fitchîs imådjes"
 
 #: gnome/gscreen.c:1647
 msgid "Video/animation files"
-msgstr ""
+msgstr "Fitchîs videyo eyèt animåcions"
 
 #: gnome/gscreen.c:1649
 msgid "Audio files"
-msgstr ""
+msgstr "Fitchîs audio"
 
 #: gnome/gscreen.c:1651
 msgid "C program files"
-msgstr ""
+msgstr "Fitchîs C"
 
 #: gnome/gscreen.c:1653
 msgid "C++ program files"
-msgstr ""
+msgstr "Fitchîs C++"
 
 #: gnome/gscreen.c:1655
 msgid "Objective-C program files"
-msgstr ""
+msgstr "Fitchîs objective-C"
 
 #: gnome/gscreen.c:1657
 msgid "Scheme program files"
-msgstr ""
+msgstr "Fitchîs Scheme"
 
 #: gnome/gscreen.c:1659
 msgid "Assembler program files"
-msgstr ""
+msgstr "Fitchîs assembler"
 
 #: gnome/gscreen.c:1661
 msgid "Misc. program files"
-msgstr ""
+msgstr "Fitchîs programe (ôtes)"
 
 #: gnome/gscreen.c:1663
 msgid "Font files"
-msgstr ""
+msgstr "Fitchîs fontes"
 
 #: gnome/gscreen.c:1790
 #, c-format
 msgid "Search: %s"
-msgstr ""
+msgstr "Cachî après: %s"
 
 #: gnome/gscreen.c:1800
 #, c-format
 msgid "%s bytes in %d file"
-msgstr ""
+msgstr "%s bytes è fitchî %d"
 
 #: gnome/gscreen.c:1800
 #, c-format
 msgid "%s bytes in %d files"
-msgstr ""
+msgstr "%s bytes è fitchî %d"
 
 #: gnome/gscreen.c:1826 src/screen.c:670
 msgid "<readlink failed>"
@@ -1389,47 +1390,47 @@
 
 #: gnome/gscreen.c:2335
 msgid "Back"
-msgstr ""
+msgstr "Èn Erî"
 
 #: gnome/gscreen.c:2335
 msgid "Go to the previously visited directory"
-msgstr ""
+msgstr "Eraler å ridant wice ki vos estîz dvant ci chal"
 
 #: gnome/gscreen.c:2337
 msgid "Up"
-msgstr ""
+msgstr "Dizeu"
 
 #: gnome/gscreen.c:2337
 msgid "Go up a level in the directory heirarchy"
-msgstr ""
+msgstr "Rimonter on schayon pus hôt sol schåle des ridants"
 
 #: gnome/gscreen.c:2339
 msgid "Forward"
-msgstr ""
+msgstr "Èn Avant"
 
 #: gnome/gscreen.c:2339
 msgid "Go to the next directory"
-msgstr ""
+msgstr "Potchî è ridant d' après"
 
 #: gnome/gscreen.c:2342 src/tree.c:1011
 msgid "Rescan"
-msgstr ""
+msgstr "Rilére"
 
 #: gnome/gscreen.c:2342
 msgid "Rescan the current directory"
-msgstr ""
+msgstr "Rilére li ridant do moumint"
 
 #: gnome/gscreen.c:2345
 msgid "Home"
-msgstr ""
+msgstr "Måjhon"
 
 #: gnome/gscreen.c:2345
 msgid "Go to your home directory"
-msgstr ""
+msgstr "Eraler a vosse ridant måjhon"
 
 #: gnome/gscreen.c:2486
 msgid "Location:"
-msgstr ""
+msgstr "Eplaeçmint:"
 
 #. 1
 #: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1184
@@ -1439,7 +1440,7 @@
 #: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:144
 #: src/wtools.c:289 src/wtools.c:563
 msgid "&Ok"
-msgstr ""
+msgstr "I &Va"
 
 #: gnome/gview.c:135 src/view.c:718
 #, c-format
@@ -1449,20 +1450,20 @@
 #: gnome/gview.c:137 src/view.c:720
 #, c-format
 msgid "Col %d"
-msgstr ""
+msgstr "Col %d"
 
 #: gnome/gview.c:141 src/view.c:724
 #, c-format
 msgid "%s bytes"
-msgstr ""
+msgstr "%s bytes"
 
 #: gnome/gview.c:305
 msgid "_Goto line"
-msgstr ""
+msgstr "_Potchî al Roye"
 
 #: gnome/gview.c:306
 msgid "Jump to a specified line number"
-msgstr ""
+msgstr "Potchî a té ou té limerô di roye"
 
 #: gnome/gview.c:308
 msgid "_Monitor file"
@@ -1474,11 +1475,11 @@
 
 #: gnome/gview.c:315
 msgid "Regexp search"
-msgstr ""
+msgstr "Cweraedje avou erûleye ratoûrneure"
 
 #: gnome/gview.c:316
 msgid "Regular expression search"
-msgstr ""
+msgstr "Cweraedje avou ene erûleye ratoûrneure (regular expression)"
 
 #: gnome/gview.c:325
 msgid "_Wrap"
@@ -1495,77 +1496,77 @@
 
 #: gnome/gview.c:332
 msgid "_Formatted"
-msgstr ""
+msgstr "_Adjinçné"
 
 #: gnome/gview.c:334
 msgid "_Hex"
-msgstr ""
+msgstr "_Hex"
 
 #: gnome/gview.c:340
 msgid "_Search"
-msgstr ""
+msgstr "_Cweraedje"
 
 #: gnome/gwidget.c:90
 msgid "ok"
-msgstr ""
+msgstr "i va"
 
 #: gnome/gwidget.c:92
 msgid "cancel"
-msgstr ""
+msgstr "rinoncî"
 
 #: gnome/gwidget.c:94
 msgid "help"
-msgstr ""
+msgstr "aidance"
 
 #: gnome/gwidget.c:96 src/file.c:2252
 msgid "yes"
-msgstr ""
+msgstr "oyi"
 
 #: gnome/gwidget.c:98 src/file.c:2250
 msgid "no"
-msgstr ""
+msgstr "neni"
 
 #: gnome/gwidget.c:100
 msgid "exit"
-msgstr ""
+msgstr "moussî foû"
 
 #: gnome/gwidget.c:102
 msgid "abort"
-msgstr ""
+msgstr "si djoker"
 
 #: gnome/gmount.c:195
 msgid "Could not open the /etc/fstab file"
-msgstr ""
+msgstr "Dji n' a savu drovi li fitchî /ets/fstab"
 
 #: gnome/gmount.c:322
 #, c-format
 msgid "Could not symlink %s to %s; will not have such a desktop device icon."
-msgstr ""
+msgstr "Dji n' a savu fé on loyén simbolike di %s a %s; vos n' åroz nole imådjete po cist éndjin so vosse sicribanne."
 
 #: gnome/gmount.c:374 gnome/gmount.c:389
 #, c-format
 msgid "CD-ROM %d"
-msgstr ""
+msgstr "CD-ROM %d"
 
 #: gnome/gmount.c:379
 #, c-format
 msgid "Floppy %d"
-msgstr ""
+msgstr "Plakete %d"
 
 #: gnome/gmount.c:385
 #, c-format
 msgid "Disk %d"
-msgstr ""
+msgstr "Plake %d"
 
 #: gnome/gmount.c:395
 #, c-format
 msgid "NFS dir %s"
-msgstr ""
+msgstr "Ridant NFS %s"
 
 #: gnome/gmount.c:399
 #, c-format
 msgid "Device %d"
-msgstr ""
+msgstr "Éndjin %d"
 
 #. The file-name is printed after the ':'
 #: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240
@@ -1574,45 +1575,47 @@
 #: src/screen.c:2383 src/tree.c:683 src/tree.c:689 src/wtools.c:222
 #: vfs/fish.c:224
 msgid " Error "
-msgstr ""
+msgstr " Aroke "
 
 #: gtkedit/edit.c:131 gtkedit/edit.c:233
 msgid " Failed trying to open file for reading: "
-msgstr ""
+msgstr " Dj' a fwait berwete come dji sayîve di drovi li fitchî po lére: "
 
 #: gtkedit/edit.c:240
 msgid " Cannot get size/permissions info on file: "
-msgstr ""
+msgstr " Dji n' sai obtni li grandeus ou les permissions pol fitchî: "
 
 #: gtkedit/edit.c:247
 msgid " Not an ordinary file: "
-msgstr ""
+msgstr " Çouchal, ci n' est nén on fitchî ôrdinaire: "
 
 #: gtkedit/edit.c:253
 msgid " File is too large: "
-msgstr ""
+msgstr " Li fitchî est trop grand: "
 
 #: gtkedit/edit.c:254
 msgid ""
 " \n"
 " Increase edit.h:MAXBUF and recompile the editor. "
 msgstr ""
+" \n"
+" Agrandixhox edit.h:MAXBUF èt s' ricopilez l' aspougneu. "
 
 #: gtkedit/edit.c:310 gtkedit/edit.c:346
 msgid " Error allocating memory "
-msgstr ""
+msgstr " Aroke come dji pårtixheu li memwere "
 
 #: gtkedit/editcmd.c:334
 msgid "Quick save "
-msgstr ""
+msgstr "Schaper al vole "
 
 #: gtkedit/editcmd.c:335
 msgid "Safe save "
-msgstr ""
+msgstr "Schaper a såvrité "
 
 #: gtkedit/editcmd.c:336
 msgid "Do backups -->"
-msgstr ""
+msgstr "Fé des copeyes di såvrité -->"
 
 #. NLS  for hotkeys?
 #: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1136 gtkedit/editcmd.c:1182
@@ -1624,20 +1627,21 @@
 #: src/layout.c:371 src/learn.c:59 src/option.c:145 src/panelize.c:86
 #: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561
 msgid "&Cancel"
-msgstr ""
+msgstr "&Rinoncî"
 
 #: gtkedit/editcmd.c:345
 msgid "Extension:"
-msgstr ""
+msgstr "Cawete:"
 
+# (Edit + Save) mode / Edit (Save mode)???
 #. NLS ?
 #: gtkedit/editcmd.c:352
 msgid " Edit Save Mode "
-msgstr ""
+msgstr " Môde Aspougnî Schaper "
 
 #: gtkedit/editcmd.c:476
 msgid " Save As "
-msgstr ""
+msgstr " Schaper èt rlomer "
 
 #. Warning message with a query to continue or cancel the operation
 #: gtkedit/editcmd.c:490 gtkedit/editcmd.c:809 gtkedit/editcmd.c:839
@@ -1646,144 +1650,146 @@
 #: src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 src/utilunix.c:394
 #: src/utilunix.c:465 vfs/mcfs.c:170
 msgid " Warning "
-msgstr ""
+msgstr " Advertixhmint "
 
 #: gtkedit/editcmd.c:491
 msgid " A file already exists with this name. "
-msgstr ""
+msgstr " I gn a ddja on fitchî lomé insi. "
 
 #. Push buttons to over-write the current file, or cancel the operation
 #: gtkedit/editcmd.c:493
 msgid "Overwrite"
-msgstr ""
+msgstr "Sipotchî"
 
 #: gtkedit/editcmd.c:493 gtkedit/editcmd.c:555 gtkedit/editcmd.c:782
 #: gtkedit/editcmd.c:809 gtkedit/editcmd.c:839 gtkedit/editcmd.c:986
 #: gtkedit/editcmd.c:1578
 msgid "Cancel"
-msgstr ""
+msgstr "Rinoncî"
 
 #: gtkedit/editcmd.c:509
 msgid " Save as "
-msgstr ""
+msgstr " Schaper eyèt rlomer "
 
 #: gtkedit/editcmd.c:509 gtkedit/editcmd.c:2633
 msgid " Error trying to save file. "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di schaper li fitchî. "
 
 #. This heads the delete macro error dialog box
 #: gtkedit/editcmd.c:625 gtkedit/editcmd.c:633 gtkedit/editcmd.c:658
 msgid " Delete macro "
-msgstr ""
+msgstr " Disfacer macro "
 
 #. 'Open' = load temp file
 #: gtkedit/editcmd.c:627
 msgid " Error trying to open temp file "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di drovi on fitchî temp "
 
 #. 'Open' = load temp file
 #: gtkedit/editcmd.c:635 gtkedit/editcmd.c:696 gtkedit/editcmd.c:764
 msgid " Error trying to open macro file "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di drovi on fitchî macro "
 
 #: gtkedit/editcmd.c:640 gtkedit/editcmd.c:648 gtkedit/editcmd.c:684
 #: gtkedit/editcmd.c:739
 #, c-format
 msgid "key '%d 0': "
-msgstr ""
+msgstr "tape '%d 0': "
 
 #: gtkedit/editcmd.c:659
 msgid " Error trying to overwrite macro file "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di spotchî li fitchî macro "
 
 #. This heads the 'Macro' dialog box
 #: gtkedit/editcmd.c:676
 msgid " Macro "
-msgstr ""
+msgstr " Macro "
 
 #. Input line for a single key press follows the ':'
 #: gtkedit/editcmd.c:678
 msgid " Press the macro's new hotkey: "
-msgstr ""
+msgstr " Tchôkî li novele tape rascoûrti pol macro: "
 
 #. This heads the 'Save Macro' dialog box
 #: gtkedit/editcmd.c:696
 msgid " Save macro "
-msgstr ""
+msgstr " Schaper li macro "
 
 #: gtkedit/editcmd.c:706 gtkedit/editcmd.c:713
 msgid " Delete Macro "
-msgstr ""
+msgstr " Disfacer li macro "
 
 #. This heads the 'Load Macro' dialog box
 #: gtkedit/editcmd.c:763
 msgid " Load macro "
-msgstr ""
+msgstr " Tcherdjî li macro "
 
 #: gtkedit/editcmd.c:777 gtkedit/editcmd.c:779
 msgid " Confirm save file? : "
-msgstr ""
+msgstr " Racertiner ki vos voloz bén schaper li fitchî? : "
 
 #. Buttons to 'Confirm save file' query
 #: gtkedit/editcmd.c:782
 msgid " Save file "
-msgstr ""
+msgstr " Schaper Fitchî "
 
 #: gtkedit/editcmd.c:782 gtkedit/editwidget.c:1066 src/view.c:2030
 msgid "Save"
-msgstr ""
+msgstr "Schaper"
 
 #: gtkedit/editcmd.c:809 gtkedit/editcmd.c:839
 msgid ""
 " Current text was modified without a file save. \n"
 " Continue discards these changes. "
 msgstr ""
+" Li texe do moumint a stî candjî mins nén schapé. \n"
+" Si vos tcheryîz pus lon, les candjmints seront pierdus. "
 
 #: gtkedit/editcmd.c:809 gtkedit/editcmd.c:839 gtkedit/editcmd.c:986
 msgid "Continue"
-msgstr ""
+msgstr "Continouwer"
 
 #. Heads the 'Load' file dialog box
 #: gtkedit/editcmd.c:828 gtkedit/editcmd.c:842
 msgid " Load "
-msgstr ""
+msgstr " Tcherdjî "
 
 #: gtkedit/editcmd.c:828
 msgid " Error trying to open file for reading "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di drovi li fitchî pol lére "
 
 #: gtkedit/editcmd.c:986 gtkedit/editcmd.c:1083
 msgid " Block is large, you may not be able to undo this action. "
-msgstr ""
+msgstr " Li blo est lådje; s' il astchait, vos n' såroz disfé cist bezogne. "
 
 #: gtkedit/editcmd.c:1083
 msgid " Continue "
-msgstr ""
+msgstr " Continouwer "
 
 #: gtkedit/editcmd.c:1083
 msgid " Cancel "
-msgstr ""
+msgstr " Rinoncî "
 
 #: gtkedit/editcmd.c:1138 src/filegui.c:597
 msgid "al&L"
-msgstr ""
+msgstr "Te&rtos"
 
 #: gtkedit/editcmd.c:1140 src/file.c:2174 src/filegui.c:267
 msgid "&Skip"
-msgstr ""
+msgstr "&Passer"
 
 #: gtkedit/editcmd.c:1142
 msgid "&Replace"
-msgstr ""
+msgstr "&Mete el Plaece"
 
 #. This is for the confirm replace dialog box. The replaced string comes after the ':'
 #: gtkedit/editcmd.c:1148 gtkedit/editcmd.c:1576
 msgid " Replace with: "
-msgstr ""
+msgstr " Mete çouchal el plaece: "
 
 #: gtkedit/editcmd.c:1152
 msgid " Confirm replace "
-msgstr ""
+msgstr " Racertiner li discandje "
 
 #: gtkedit/editcmd.c:1186 gtkedit/editcmd.c:1271
 msgid "scanf &Expression"
@@ -1791,72 +1797,72 @@
 
 #: gtkedit/editcmd.c:1188
 msgid "replace &All"
-msgstr ""
+msgstr "mete el plaece tot &costé"
 
 #: gtkedit/editcmd.c:1190
 msgid "pr&Ompt on replace"
-msgstr ""
+msgstr "&Dimander cwè divant do discandjî"
 
 #: gtkedit/editcmd.c:1192 gtkedit/editcmd.c:1273
 msgid "&Backwards"
-msgstr ""
+msgstr "È&n erî"
 
 #: gtkedit/editcmd.c:1194 gtkedit/editcmd.c:1275
 msgid "&Regular expression"
-msgstr ""
+msgstr "Erûle&ye Ratoûrneure"
 
 #: gtkedit/editcmd.c:1196 gtkedit/editcmd.c:1277
 msgid "&Whole words only"
-msgstr ""
+msgstr "Rén &ki des mots etirs"
 
 #: gtkedit/editcmd.c:1198 gtkedit/editcmd.c:1279
 msgid "case &Sensitive"
-msgstr ""
+msgstr "Grandès <> ptitès letes"
 
 #: gtkedit/editcmd.c:1202
 msgid " Enter replacement argument order eg. 3,2,1,4 "
-msgstr ""
+msgstr " Dinez l' ôrde des årgumints di discandje, metans: 3, 2, 1, 4 "
 
 #: gtkedit/editcmd.c:1206
 msgid " Enter replacement string:"
-msgstr ""
+msgstr " Dinez li tchinne pol discandje:"
 
 #: gtkedit/editcmd.c:1210 gtkedit/editcmd.c:1283 src/view.c:1955
 msgid " Enter search string:"
-msgstr ""
+msgstr " Dinez li tchinne a cweri après:"
 
 #. Heads the 'Replace' dialog box
 #: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1480 gtkedit/editcmd.c:1574
 #: gtkedit/editcmd.c:2125 gtkedit/editcmd.c:2156 gtkedit/editcmd.c:2158
 msgid " Replace "
-msgstr ""
+msgstr " Mete el plaece "
 
 #. Heads the 'Search' dialog box
 #: gtkedit/editcmd.c:1297 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2227
 #: src/view.c:1509 src/view.c:1608 src/view.c:1730 src/view.c:1923
 #: src/view.c:1955
 msgid " Search "
-msgstr ""
+msgstr " Cweri "
 
 #. An input line comes after the ':'
 #: gtkedit/editcmd.c:1346
 msgid " Enter search text : "
-msgstr ""
+msgstr " Tchinne a cweri après: "
 
 #: gtkedit/editcmd.c:1353
 msgid " Enter replace text : "
-msgstr ""
+msgstr " Tchinne a mete el plaece: "
 
 #: gtkedit/editcmd.c:1356 gtkedit/editcmd.c:1357
 #, c-format
 msgid ""
 "You can enter regexp substrings with %s (not \\1, \\2 like sed) then use "
 "\"Enter...order\""
-msgstr ""
+msgstr "Vos poloz dner des sortchinnes come erûleyès ratoûrneures avou %s (nén \\1, \\2 come dins sed); adon, eployîz \"Dinez...sortchinne)\""
 
 #: gtkedit/editcmd.c:1359
 msgid " Enter argument (or substring) order : "
-msgstr ""
+msgstr "Dinez l' ôrde des årgumints (ou sortchinne) : "
 
 #. Tool hint
 #: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364
@@ -1868,41 +1874,41 @@
 #. The following are check boxes
 #: gtkedit/editcmd.c:1369
 msgid " Whole words only "
-msgstr ""
+msgstr " Mots etirs seulmint "
 
 #: gtkedit/editcmd.c:1371
 msgid " Case sensitive "
-msgstr ""
+msgstr " Grandès <> ptitès letes "
 
 #: gtkedit/editcmd.c:1374
 msgid " Regular expression "
-msgstr ""
+msgstr " Erûleye ratoûrneure "
 
 #: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376
 msgid "See the regex man page for how to compose a regular expression"
-msgstr ""
+msgstr "Loukî el pådje man regex po savu cmint-ce k' on-z adjinçneye ene erûleye ratoûrneure"
 
 #: gtkedit/editcmd.c:1382
 msgid " Backwards "
-msgstr ""
+msgstr " Èn erî "
 
 #. Tool hint
 #: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385
 msgid "Warning: Searching backward can be slow"
-msgstr ""
+msgstr "Advertixhmint: li rcweraedje èn erî pout esse londjin"
 
 #: gtkedit/editcmd.c:1398
 msgid " Prompt on replace "
-msgstr ""
+msgstr " Dimandez cwè pol discandje "
 
 #. Tool hint
 #: gtkedit/editcmd.c:1400
 msgid "Ask before making each replacement"
-msgstr ""
+msgstr "Dimander cwè a tchaeke côp dvant do fé ene discandje"
 
 #: gtkedit/editcmd.c:1402
 msgid " Replace all "
-msgstr ""
+msgstr " Mete el plaece tot costé "
 
 #: gtkedit/editcmd.c:1405
 msgid " Scanf expression "
@@ -1911,159 +1917,161 @@
 #. Tool hint
 #: gtkedit/editcmd.c:1407
 msgid "Allows entering of a C format string, see the scanf man page"
-msgstr ""
+msgstr "Po savu dner ene tchinne di cogne C, loukî el pådje man di scanf"
 
 #. Tool hint
 #: gtkedit/editcmd.c:1412
 msgid "Begin search, Enter"
-msgstr ""
+msgstr "Ataker a cweri, Intreye"
 
 #. Tool hint
 #: gtkedit/editcmd.c:1415
 msgid "Abort this dialog, Esc"
-msgstr ""
+msgstr "Rinoncî a cisse divize, Esc"
 
 #. Buttons for the confirm replace dialog box.
 #: gtkedit/editcmd.c:1578
 msgid "Replace"
-msgstr ""
+msgstr "Mete el Plaece"
 
 #: gtkedit/editcmd.c:1578
 msgid "Skip"
-msgstr ""
+msgstr "Passer Hute"
 
 #: gtkedit/editcmd.c:1578
 msgid "Replace all"
-msgstr ""
+msgstr "Mete el plaece tot costé"
 
 #: gtkedit/editcmd.c:1951
 msgid ""
 " Invalid regular expression, or scanf expression with to many conversions "
-msgstr ""
+msgstr "Erûleye ratoûrneure nén valåbe ou ratoûrneure scanf avou trop di conviertixhmints "
 
 #. "Invalid regexp string or scanf string"
 #: gtkedit/editcmd.c:2127
 msgid " Error in replacement format string. "
-msgstr ""
+msgstr " Li tchinne di discandje est må fwaite "
 
 #: gtkedit/editcmd.c:2155
 #, c-format
 msgid " %ld replacements made. "
-msgstr ""
+msgstr " %ld discandjes di fwaites. "
 
 #: gtkedit/editcmd.c:2158 gtkedit/editcmd.c:2227
 msgid " Search string not found. "
-msgstr ""
+msgstr " Dji n' a nén trové li tchinne a cweri. "
 
 #. Confirm 'Quit' dialog box
 #: gtkedit/editcmd.c:2251 gtkedit/editcmd.c:2266 gtkedit/editcmd.c:2269
 msgid " Quit "
-msgstr ""
+msgstr " Cwiter "
 
 #: gtkedit/editcmd.c:2252 gtkedit/editcmd.c:2270
 msgid ""
 " Current text was modified without a file save. \n"
 " Save with exit? "
 msgstr ""
+" Li texe do moumint a stî candjî mins nén schapé. \n"
+" El fåt-i schaper tot moussant foû? "
 
 #: gtkedit/editcmd.c:2266
 msgid " File was modified, Save with exit? "
-msgstr ""
+msgstr " Li fitchî a stî candjî. El fåt-i schaper tot moussant foû? "
 
 #: gtkedit/editcmd.c:2266
 msgid "Cancel quit"
-msgstr ""
+msgstr "Rinoncî a moussî foû"
 
 #: gtkedit/editcmd.c:2266 src/cmd.c:249 src/file.c:1859 src/file.c:2233
 #: src/filegui.c:603 src/hotlist.c:1035 src/main.c:854 src/screen.c:2132
 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:746 src/view.c:404
 msgid "&Yes"
-msgstr ""
+msgstr "&Oyi"
 
 #: gtkedit/editcmd.c:2266 src/cmd.c:249 src/file.c:1859 src/file.c:2233
 #: src/filegui.c:602 src/hotlist.c:1035 src/main.c:854 src/screen.c:2132
 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:746 src/view.c:404
 msgid "&No"
-msgstr ""
+msgstr "&Neni"
 
 #: gtkedit/editcmd.c:2270
 msgid " &Cancel quit "
-msgstr ""
+msgstr " &Rinoncî a moussî foû "
 
 #: gtkedit/editcmd.c:2270
 msgid " &Yes "
-msgstr ""
+msgstr " &Oyi "
 
 #: gtkedit/editcmd.c:2270
 msgid " &No "
-msgstr ""
+msgstr " &Neni "
 
 #: gtkedit/editcmd.c:2473 gtkedit/editcmd.c:2548
 msgid " Copy to clipboard "
-msgstr ""
+msgstr " Copyî è tchapea emacralé "
 
 #: gtkedit/editcmd.c:2473 gtkedit/editcmd.c:2495 gtkedit/editcmd.c:2548
 #: gtkedit/editcmd.c:2561
 msgid " Unable to save to file. "
-msgstr ""
+msgstr " Dji n' a savu schaper çoula dins on fitchî. "
 
 #: gtkedit/editcmd.c:2495 gtkedit/editcmd.c:2561
 msgid " Cut to clipboard "
-msgstr ""
+msgstr " Côper evoye è tchapea emacralé "
 
 #: gtkedit/editcmd.c:2583 gtkedit/editcmd.c:2587 gtkedit/editcmd.c:2592
 #: gtkedit/editcmd.c:2595 src/view.c:1895
 msgid " Goto line "
-msgstr ""
+msgstr " Potchî al roye "
 
 #: gtkedit/editcmd.c:2583 gtkedit/editcmd.c:2587 gtkedit/editcmd.c:2592
 #: gtkedit/editcmd.c:2595
 msgid " Enter line: "
-msgstr ""
+msgstr " Diner roye: "
 
 #: gtkedit/editcmd.c:2616 gtkedit/editcmd.c:2633
 msgid " Save Block "
-msgstr ""
+msgstr " Schaper li blo "
 
 #: gtkedit/editcmd.c:2667
 msgid " Insert File "
-msgstr ""
+msgstr " Sitichî on fitchî "
 
 #: gtkedit/editcmd.c:2682
 msgid " Insert file "
-msgstr ""
+msgstr " Sitichî on fitchî "
 
 #: gtkedit/editcmd.c:2682
 msgid " Error trying to insert file. "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di stitchî on fitchî. "
 
 #. Not essential to translate
 #: gtkedit/editcmd.c:2702
 msgid " Sort block "
-msgstr ""
+msgstr " Relire li blo "
 
 #. Not essential to translate
 #: gtkedit/editcmd.c:2702 gtkedit/editcmd.c:2756
 msgid " You must first highlight a block of text. "
-msgstr ""
+msgstr " Po cmincî vos dvoz mete è valeur on blo di texe. "
 
 #: gtkedit/editcmd.c:2709
 msgid " Run Sort "
-msgstr ""
+msgstr " Relire "
 
 #. Not essential to translate
 #: gtkedit/editcmd.c:2711
 msgid " Enter sort options (see manpage) separated by whitespace: "
-msgstr ""
+msgstr " Dinez les tchûzes pol relîjhaedje (loukî el pådje man) avou on blanc inte: "
 
 #: gtkedit/editcmd.c:2722 gtkedit/editcmd.c:2728
 msgid " Sort "
-msgstr ""
+msgstr " Relire "
 
 #. Not essential to translate
 #: gtkedit/editcmd.c:2724
 msgid " Error trying to execute sort command "
-msgstr ""
+msgstr " Yåk n' a nén stî come dji sayîve di relire "
 
 #. Not essential to translate
 #: gtkedit/editcmd.c:2730
@@ -2080,25 +2088,26 @@
 msgid " Error trying to stat file "
 msgstr ""
 
+# Viebe ou no?
 #: gtkedit/editcmd.c:2856
 msgid " Mail "
-msgstr ""
+msgstr " Emile "
 
 #: gtkedit/editcmd.c:2869
 msgid " Copies to"
-msgstr ""
+msgstr " Copyî po "
 
 #: gtkedit/editcmd.c:2873
 msgid " Subject"
-msgstr ""
+msgstr " Sudjet"
 
 #: gtkedit/editcmd.c:2877
 msgid " To"
-msgstr ""
+msgstr " Po"
 
 #: gtkedit/editcmd.c:2879
 msgid " mail -s <subject> -c <cc> <to>"
-msgstr ""
+msgstr " mail -s <subject> -c <cc> <to>"
 
 #: gtkedit/editoptions.c:36
 msgid "Intuitive"
@@ -2106,15 +2115,16 @@
 
 #: gtkedit/editoptions.c:36
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
+# Femrin ou omrin
 #: gtkedit/editoptions.c:39
 msgid "None"
-msgstr ""
+msgstr "Nouk"
 
 #: gtkedit/editoptions.c:39
 msgid "Dynamic paragraphing"
-msgstr ""
+msgstr "Fé les hagnons al voleye"
 
 #: gtkedit/editoptions.c:39
 msgid "Type writer wrap"
@@ -2123,7 +2133,7 @@
 #. 2
 #: gtkedit/editoptions.c:74
 msgid "Word wrap line length : "
-msgstr ""
+msgstr "Longueu del roye wice k' i fåt côper les mots : "
 
 #. 4
 #: gtkedit/editoptions.c:80
@@ -2132,12 +2142,12 @@
 
 #: gtkedit/editoptions.c:88
 msgid "synta&X highlighting"
-msgstr ""
+msgstr "mete è &valeur l' emantchaedje"
 
 #. 7
 #: gtkedit/editoptions.c:94
 msgid "confir&M before saving"
-msgstr ""
+msgstr "ra&certiner dvant di schaper"
 
 #. 8
 #: gtkedit/editoptions.c:97
@@ -2171,25 +2181,25 @@
 
 #: gtkedit/editoptions.c:159
 msgid " Editor options "
-msgstr ""
+msgstr " Tchûzes po l' aspougneu "
 
 #. Not essential to translate
 #: gtkedit/editwidget.c:312
 msgid "Error initialising editor.\n"
-msgstr ""
+msgstr "Yåk n' a nén stî come dj' enondéve l' aspougneu.\n"
 
 #: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1705 src/screen.c:2361
 #: src/screen.c:2391 src/tree.c:1009 src/view.c:2025
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
 #: gtkedit/editwidget.c:1067
 msgid "Mark"
-msgstr ""
+msgstr "Marker"
 
 #: gtkedit/editwidget.c:1068
 msgid "Replac"
-msgstr ""
+msgstr "Discandjî"
 
 #: gtkedit/editwidget.c:1074 src/main.c:1707
 msgid "PullDn"
@@ -2198,7 +2208,7 @@
 #: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1708 src/view.c:2027
 #: src/view.c:2047
 msgid "Quit"
-msgstr ""
+msgstr "Cwiter"
 
 #: gtkedit/editmenu.c:57
 msgid " Word wrap "
@@ -2207,11 +2217,11 @@
 #. Not essential to translate
 #: gtkedit/editmenu.c:59
 msgid " Enter line length, 0 for off: "
-msgstr ""
+msgstr " Dinez li longueu del roye, 0 po dismetu: "
 
 #: gtkedit/editmenu.c:70
 msgid " About "
-msgstr ""
+msgstr " Å dfait "
 
 #: gtkedit/editmenu.c:71
 msgid ""
@@ -2223,98 +2233,105 @@
 "       A user friendly text editor written\n"
 "           for the Midnight Commander.\n"
 msgstr ""
+"\n"
+"                 Cooledit  v2.1\n"
+"\n"
+" Copyright (C) 1996 the Free Software Foundation\n"
+"\n"
+"       Èn amishtåve aspougneu di texe sicrît\n"
+"           pol the Midnight Commander.\n"
 
 #: gtkedit/editmenu.c:119 gtkedit/editmenu.c:135
 msgid "&Open/load...     C-o"
-msgstr ""
+msgstr "&Drovi/tcherdjî...     C-o"
 
 #: gtkedit/editmenu.c:120
 msgid "&New              C-n"
-msgstr ""
+msgstr "&Novea              C-n"
 
 #: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
 msgid "&Save              F2"
-msgstr ""
+msgstr "&Schaper             F2"
 
 #: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139
 msgid "save &As...       F12"
-msgstr ""
+msgstr "Schaper èt &rlomer...       F12"
 
 #: gtkedit/editmenu.c:125 gtkedit/editmenu.c:141
 msgid "&Insert file...   F15"
-msgstr ""
+msgstr "S&itichî fitchî...   F15"
 
 #: gtkedit/editmenu.c:126
 msgid "copy to &File...  C-f"
-msgstr ""
+msgstr "copyî dins &Fitchî...  C-f"
 
 #: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144
 msgid "a&Bout...            "
-msgstr ""
+msgstr "Å&dfait...            "
 
 #: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146
 msgid "&Quit             F10"
-msgstr ""
+msgstr "&Cwiter             F10"
 
 #: gtkedit/editmenu.c:136
 msgid "&New            C-x k"
-msgstr ""
+msgstr "&Novea            C-x k"
 
 #: gtkedit/editmenu.c:142
 msgid "copy to &File...     "
-msgstr ""
+msgstr "copyî dins &Fitchî...     "
 
 #: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
 msgid "&Toggle Mark       F3"
-msgstr ""
+msgstr "&Discandjî Marke       F3"
 
 #: gtkedit/editmenu.c:152 gtkedit/editmenu.c:169
 msgid "&Mark Columns    S-F3"
-msgstr ""
+msgstr "&Marker Colones    S-F3"
 
 #: gtkedit/editmenu.c:154 gtkedit/editmenu.c:171
 msgid "toggle &Ins/overw Ins"
-msgstr ""
+msgstr "discandjî &Ins/overw Ins"
 
 #: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
 msgid "&Copy              F5"
-msgstr ""
+msgstr "&Copyî              F5"
 
 #: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
 msgid "&Move              F6"
-msgstr ""
+msgstr "&Bodjî              F6"
 
 #: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175
 msgid "&Delete            F8"
-msgstr ""
+msgstr "&Disfacer            F8"
 
 #: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177
 msgid "&Undo             C-u"
-msgstr ""
+msgstr "Di&sfé             C-u"
 
 #: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
 msgid "&Beginning     C-PgUp"
-msgstr ""
+msgstr "Co&pete     C-PgUp"
 
 #: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180
 msgid "&End           C-PgDn"
-msgstr ""
+msgstr "&Valeye           C-PgDn"
 
 #: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
 msgid "&Search...         F7"
-msgstr ""
+msgstr "C&weri...         F7"
 
 #: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
 msgid "search &Again     F17"
-msgstr ""
+msgstr "cweri eco ene &Feye     F17"
 
 #: gtkedit/editmenu.c:187 gtkedit/editmenu.c:194
 msgid "&Replace...        F4"
-msgstr ""
+msgstr "Discand&jî...        F4"
 
 #: gtkedit/editmenu.c:199 gtkedit/editmenu.c:221
 msgid "&Goto line...            M-l"
-msgstr ""
+msgstr "&Potchî al roye...            M-l"
 
 #: gtkedit/editmenu.c:201 gtkedit/editmenu.c:223
 msgid "insert &Literal...       C-q"
@@ -2322,39 +2339,39 @@
 
 #: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225
 msgid "&Refresh screen          C-l"
-msgstr ""
+msgstr "&Riponde li waitroûle          C-l"
 
 #: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
 msgid "&Start record macro      C-r"
-msgstr ""
+msgstr "&Ataker a inredjistrer ene macro      C-r"
 
 #: gtkedit/editmenu.c:206 gtkedit/editmenu.c:228
 msgid "&Finish record macro...  C-r"
-msgstr ""
+msgstr "&Fini d' inredjistrer ene macro...  C-r"
 
 #: gtkedit/editmenu.c:207
 msgid "&Execute macro...   C-a, KEY"
-msgstr ""
+msgstr "&Enonder ene macro...   C-a, KEY"
 
 #: gtkedit/editmenu.c:208 gtkedit/editmenu.c:230
 msgid "delete macr&O...            "
-msgstr ""
+msgstr "disfacer ene macr&O...            "
 
 #: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232
 msgid "insert &Date/time           "
-msgstr ""
+msgstr "sititchî &Date/eure           "
 
 #: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234
 msgid "format p&Aragraph        M-p"
-msgstr ""
+msgstr "arindjî h&Agnon        M-p"
 
 #: gtkedit/editmenu.c:213
 msgid "'ispell' s&Pell check    C-p"
-msgstr ""
+msgstr "waitî li scrîjhaedje avou 'ispell'    C-p"
 
 #: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
 msgid "sor&T...                 M-t"
-msgstr ""
+msgstr "re&Lire...                 M-t"
 
 #: gtkedit/editmenu.c:215 gtkedit/editmenu.c:237
 msgid "'indent' &C Formatter    F19"
@@ -2362,19 +2379,19 @@
 
 #: gtkedit/editmenu.c:216
 msgid "&Mail...                    "
-msgstr ""
+msgstr "e&Mîler...                    "
 
 #: gtkedit/editmenu.c:229
 msgid "&Execute macro... C-x e, KEY"
-msgstr ""
+msgstr "&Enonder ene macro... C-x e, KEY"
 
 #: gtkedit/editmenu.c:235
 msgid "'ispell' s&Pell check    M-$"
-msgstr ""
+msgstr "waitî li scrîjhaedje avou 'ispell'    M-$"
 
 #: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
 msgid "&General...  "
-msgstr ""
+msgstr "&Djenerå...  "
 
 #: gtkedit/editmenu.c:245 gtkedit/editmenu.c:254
 msgid "&Save mode..."
@@ -2382,78 +2399,78 @@
 
 #: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1339
 msgid "&Layout..."
-msgstr ""
+msgstr "arindj&mint del pådje..."
 
 #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t'
 #: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:392
 #: src/chmod.c:164 src/chown.c:130
 msgid " File "
-msgstr ""
+msgstr " Fitchî "
 
 #: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 gtkedit/editmenu.c:408
 msgid " Edit "
-msgstr ""
+msgstr " Aspougnî "
 
 #: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277
 msgid " Sear/Repl "
-msgstr ""
+msgstr " Cweri/Discandjî "
 
 #: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 gtkedit/editmenu.c:448
 msgid " Command "
-msgstr ""
+msgstr " Comande "
 
 #: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279
 msgid " Options "
-msgstr ""
+msgstr " Tchûzes "
 
 #: gtkedit/editmenu.c:393
 msgid "Open...\tC-o"
-msgstr ""
+msgstr "Drovi...\tC-o"
 
 #: gtkedit/editmenu.c:394
 msgid "New\tC-n"
-msgstr ""
+msgstr "Novea\tC-n"
 
 #: gtkedit/editmenu.c:396
 msgid "Save\tF2"
-msgstr ""
+msgstr "Schaper\tF2"
 
 #: gtkedit/editmenu.c:397
 msgid "Save as...\tF12"
-msgstr ""
+msgstr "Schaper èt rlomer...\tF12"
 
 #: gtkedit/editmenu.c:399
 msgid "Insert file...\tF15"
-msgstr ""
+msgstr "Sititchî on fitchî...\tF15"
 
 #: gtkedit/editmenu.c:400
 msgid "Copy to file...\tC-f"
-msgstr ""
+msgstr "Copyî dins fitchî...\tC-f"
 
 #. Tool hint
 #: gtkedit/editmenu.c:403
 msgid "Disk operations"
-msgstr ""
+msgstr "Ovraedjes sol plake"
 
 #: gtkedit/editmenu.c:409
 msgid "Toggle mark\tF3"
-msgstr ""
+msgstr "Discandjî marke\tF3"
 
 #: gtkedit/editmenu.c:410
 msgid "Toggle mark columns\tC-b"
-msgstr ""
+msgstr "Discandjî marke colones\tC-b"
 
 #: gtkedit/editmenu.c:412
 msgid "Toggle book mark\tC-M-Ins"
-msgstr ""
+msgstr "Discandjî rimårke\tC-M-Ins"
 
 #: gtkedit/editmenu.c:413
 msgid "Previous book mark\tC-M-Up"
-msgstr ""
+msgstr "Rimårke di dvant\tC-M-Up"
 
 #: gtkedit/editmenu.c:414
 msgid "Next book mark\tC-M-Down"
-msgstr ""
+msgstr "Rimårke d' après\tC-M-Down"
 
 #: gtkedit/editmenu.c:415
 msgid "Flush book marks"
@@ -2461,114 +2478,114 @@
 
 #: gtkedit/editmenu.c:417
 msgid "Toggle insert/overwrite\tIns"
-msgstr ""
+msgstr "Discandjî insert/overwrite\tIns"
 
 #: gtkedit/editmenu.c:419
 msgid "Copy block to cursor\tF5"
-msgstr ""
+msgstr "Copyî li blo al plaece do curseur\tF5"
 
 #: gtkedit/editmenu.c:420
 msgid "Move block to cursor\tF6"
-msgstr ""
+msgstr "Bodjî li blo al plaece do curseur\tF6"
 
 #: gtkedit/editmenu.c:421
 msgid "Delete block\tF8/C-Del"
-msgstr ""
+msgstr "Disfacer li blo\tF8/C-Del"
 
 #: gtkedit/editmenu.c:423
 msgid "Copy block to clipbrd\tC-Ins"
-msgstr ""
+msgstr "Copyî li blo è tchapea emacralé\tC-Ins"
 
 #: gtkedit/editmenu.c:424
 msgid "Cut block to clipbrd\tS-Del"
-msgstr ""
+msgstr "Côper li blo evoye è tchapea emacralé\tS-Del"
 
 #: gtkedit/editmenu.c:425
 msgid "Paste block from clipbrd\tS-Ins"
-msgstr ""
+msgstr "Aclaper li blo k' e-st è tchapea emacralé\tS-Ins"
 
 #: gtkedit/editmenu.c:426
 msgid "Selection history\tM-Ins"
-msgstr ""
+msgstr "Istwere des tchûzes\tM-Ins"
 
 #: gtkedit/editmenu.c:428
 msgid "Undo\tC-BackSpace"
-msgstr ""
+msgstr "Disfé\tC-BackSpace"
 
 #. Tool hint
 #: gtkedit/editmenu.c:431
 msgid "Manipulating blocks of text"
-msgstr ""
+msgstr "Dj' oûveure so des blos di texe"
 
 #: gtkedit/editmenu.c:436
 msgid " Srch/Replce "
-msgstr ""
+msgstr " Cweri/Discandjî "
 
 #: gtkedit/editmenu.c:437
 msgid "Search...\tF7"
-msgstr ""
+msgstr "Cweri...\tF7"
 
 #: gtkedit/editmenu.c:438
 msgid "Search again\tF17"
-msgstr ""
+msgstr "Cweri eco on côp\tF17"
 
 #: gtkedit/editmenu.c:439
 msgid "Replace...\tF4"
-msgstr ""
+msgstr "Mete el plaece...\tF4"
 
 #: gtkedit/editmenu.c:440
 msgid "Replace again\tF14"
-msgstr ""
+msgstr "Mete el plaece eco on côp\tF14"
 
 #. Tool hint
 #: gtkedit/editmenu.c:443
 msgid "Search for and replace text"
-msgstr ""
+msgstr "Cweri après yåk eyèt mete ene sacwè d' ôte el plaece"
 
 #: gtkedit/editmenu.c:449
 msgid "Goto line...\tM-l"
-msgstr ""
+msgstr "Potchî al roye...\tM-l"
 
 #: gtkedit/editmenu.c:451
 msgid "Start record macro\tC-r"
-msgstr ""
+msgstr "Ataker a inredjistrer ene macro\tC-r"
 
 #: gtkedit/editmenu.c:452
 msgid "Finish record macro...\tC-r"
-msgstr ""
+msgstr "Fini d' inredjistrer ene macroo...\tC-r"
 
 #: gtkedit/editmenu.c:453
 msgid "Execute macro...\tC-a, KEY"
-msgstr ""
+msgstr "Enonder ene macro...\tC-a, KEY"
 
 #: gtkedit/editmenu.c:454
 msgid "Delete macro...\t"
-msgstr ""
+msgstr "Disfacer ene macro...\t"
 
 #: gtkedit/editmenu.c:456
 msgid "Insert date/time\tC-d"
-msgstr ""
+msgstr "Sititchî date/eure\tC-d"
 
 #: gtkedit/editmenu.c:457
 msgid "Format paragraph\tM-p"
-msgstr ""
+msgstr "Adjinçner li hagnon\tM-p"
 
 #: gtkedit/editmenu.c:459
 msgid "Refresh display\tC-l"
-msgstr ""
+msgstr "Riponde li waitroûle\tC-l"
 
 #. Tool hint
 #: gtkedit/editmenu.c:462
 msgid "Macros and internal commands"
-msgstr ""
+msgstr "Macros eyèt dvintrinnès cmandes"
 
 #: gtkedit/gtkedit.c:65
 msgid "&Dismiss"
-msgstr ""
+msgstr "&Rinoncî"
 
 #: gtkedit/gtkedit.c:66
 msgid " Enter file name: "
-msgstr ""
+msgstr " No do fitchî: "
 
 #: gtkedit/gtkedit.c:111
 msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
@@ -2577,7 +2594,7 @@
 #: gtkedit/gtkedit.c:802
 msgid ""
 "gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n"
-msgstr ""
+msgstr "gtkedit.c: li variåbe d' inviron'mint HOME n' est nén metuwe èt gn a nole intreye passwd - dji lai ouve\n"
 
 #: gtkedit/gtkedit.c:1290
 msgid "Clear the edit buffer"
@@ -2585,73 +2602,73 @@
 
 #: gtkedit/gtkedit.c:1295
 msgid "Insert File"
-msgstr ""
+msgstr "Sititchî on fitchî"
 
 #: gtkedit/gtkedit.c:1295
 msgid "Insert text from a file"
-msgstr ""
+msgstr "Sititchî do texe foû d' on fitchî"
 
 #: gtkedit/gtkedit.c:1297
 msgid "Copy to file"
-msgstr ""
+msgstr "Copyî dins on fitchî"
 
 #: gtkedit/gtkedit.c:1297
 msgid "copy a block to a file"
-msgstr ""
+msgstr "Copyî on blo dins on fitchî"
 
 #: gtkedit/gtkedit.c:1337
 msgid "Search/Replace"
-msgstr ""
+msgstr "Cweri/Discandjî"
 
 #: gtkedit/syntax.c:1339 gtkedit/syntax.c:1346
 msgid " Load syntax file "
-msgstr ""
+msgstr " Tcherdjî fitchî emantchaedje "
 
 #: gtkedit/syntax.c:1339
 msgid " File access error "
-msgstr ""
+msgstr " Aroke po-z eployî li fitchî "
 
 #: gtkedit/syntax.c:1345
 #, c-format
 msgid " Error in file %s on line %d "
-msgstr ""
+msgstr " Aroke è fitchî %s al roye %d "
 
 #: src/achown.c:72 src/chmod.c:115 src/chown.c:80
 msgid "&Set"
-msgstr ""
+msgstr "&Mete"
 
 #: src/achown.c:73
 msgid "S&kip"
-msgstr ""
+msgstr "Pa&sser Hute"
 
 #: src/achown.c:74 src/chmod.c:119 src/chown.c:83
 msgid "Set &all"
-msgstr ""
+msgstr "Mete &Totafwait"
 
 #: src/achown.c:362 src/achown.c:369
 msgid "owner"
-msgstr ""
+msgstr "da"
 
 #: src/achown.c:364 src/achown.c:371
 msgid "group"
-msgstr ""
+msgstr "hopê"
 
 #: src/achown.c:366
 msgid "other"
-msgstr ""
+msgstr "ôte"
 
 #: src/achown.c:374
 msgid "On"
-msgstr ""
+msgstr "Metu"
 
 #: src/achown.c:376
 msgid "Flag"
-msgstr ""
+msgstr "Drapea"
 
 #: src/achown.c:383
 #, c-format
 msgid "%6d of %d"
-msgstr ""
+msgstr "%6d di %d"
 
 #: src/achown.c:391
 msgid " Chown advanced command "
@@ -2664,6 +2681,8 @@
 " Couldn't chmod \"%s\" \n"
 " %s "
 msgstr ""
+" Dji n' sai fé on chmod \"%s\" \n"
+" %s "
 
 #: src/achown.c:634 src/achown.c:649 src/achown.c:712 src/chown.c:223
 #: src/chown.c:345
@@ -2672,45 +2691,49 @@
 " Couldn't chown \"%s\" \n"
 " %s "
 msgstr ""
+" Dji n' sai fé on chown \"%s\" \n"
+" %s "
 
 #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324
 #: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:639
 msgid " Oops... "
-msgstr ""
+msgstr " Way!... "
 
 #: src/achown.c:667
 msgid " I can't run the Advanced Chown command on an extfs "
-msgstr ""
+msgstr " Dji n' såreu enonder li cmande Advanced Chown so èn extfs "
 
 #: src/achown.c:671
 msgid " I can't run the Advanced Chown command on a tarfs "
-msgstr ""
+msgstr " Dji n' sareu enonder li cmande Advanced Chown so on tarfs "
 
 #: src/background.c:181
 msgid "Background process:"
-msgstr ""
+msgstr "Porcessus di fond:"
 
 #: src/background.c:287 src/file.c:2173
 msgid " Background process error "
-msgstr ""
+msgstr " Aroke è processus di fond \""
 
 #: src/background.c:294
 msgid " Child died unexpectedly "
-msgstr ""
+msgstr " L' efant a moru tot d' on côp "
 
 #: src/background.c:296
 msgid " Unknown error in child "
-msgstr ""
+msgstr " Aroke nén cnoxhuwe dins l' efant "
 
 #: src/background.c:311
 msgid " Background protocol error "
-msgstr ""
+msgstr " Aroke è protocole di fond "
 
 #: src/background.c:312
 msgid ""
 " Background process sent us a request for more arguments \n"
 " than we can handle. \n"
 msgstr ""
+" Li processus di fond nos a evoyî ene dimande po-z avu did pus\n"
+" d' årgumint ki çu ki dji såreu travayî avou. \n"
 
 #: src/boxes.c:63
 msgid " Listing mode "
@@ -2718,23 +2741,23 @@
 
 #: src/boxes.c:68
 msgid "&Full file list"
-msgstr ""
+msgstr "Djîveye e&tire des fitchîs"
 
 #: src/boxes.c:69
 msgid "&Brief file list"
-msgstr ""
+msgstr "&Coûte djîveye des fitchîs"
 
 #: src/boxes.c:70
 msgid "&Long file list"
-msgstr ""
+msgstr "&Longue djîveye des fitchîs"
 
 #: src/boxes.c:71
 msgid "&User defined:"
-msgstr ""
+msgstr "A vosse &Môde:"
 
 #: src/boxes.c:72
 msgid "&Icon view"
-msgstr ""
+msgstr "Vey &Imådjetes"
 
 #: src/boxes.c:137
 msgid "user &Mini status"
@@ -2746,35 +2769,35 @@
 
 #: src/boxes.c:280
 msgid "&Reverse"
-msgstr ""
+msgstr "Å&rvier"
 
 #: src/boxes.c:281
 msgid "case sensi&tive"
-msgstr ""
+msgstr "grandès <> ptitès letes"
 
 #: src/boxes.c:282
 msgid "Sort order"
-msgstr ""
+msgstr "Ôrde po relire"
 
 #: src/boxes.c:381
 msgid " confirm &Exit "
-msgstr ""
+msgstr " racertiner ki vos voloz bén &moussî foû "
 
 #: src/boxes.c:383
 msgid " confirm e&Xecute "
-msgstr ""
+msgstr " racertiner ki vos voloz bén &enonder yåk "
 
 #: src/boxes.c:385
 msgid " confirm o&Verwrite "
-msgstr ""
+msgstr " racertiner ki vos voloz bén &spotchî yåk "
 
 #: src/boxes.c:387
 msgid " confirm &Delete "
-msgstr ""
+msgstr " racertiner ki vos voloz bén &disfacer yåk "
 
 #: src/boxes.c:393
 msgid " Confirmation "
-msgstr ""
+msgstr " Racertinaedje "
 
 #: src/boxes.c:461
 msgid "Full 8 bits output"
@@ -2782,11 +2805,11 @@
 
 #: src/boxes.c:461
 msgid "ISO 8859-1"
-msgstr ""
+msgstr "ISO 8859-1"
 
 #: src/boxes.c:461
 msgid "7 bits"
-msgstr ""
+msgstr "7 bits"
 
 #: src/boxes.c:468
 msgid "F&ull 8 bits input"
@@ -2798,11 +2821,11 @@
 
 #: src/boxes.c:651
 msgid "&Always use ftp proxy"
-msgstr ""
+msgstr "&Tofer eployî on proxy ftp"
 
 #: src/boxes.c:653
 msgid "sec"
-msgstr ""
+msgstr "seg."
 
 #: src/boxes.c:657
 msgid "ftpfs directory cache timeout:"
@@ -2810,7 +2833,7 @@
 
 #: src/boxes.c:661
 msgid "ftp anonymous password:"
-msgstr ""
+msgstr "secret po ftp anonime:"
 
 #: src/boxes.c:668
 msgid "Timeout for freeing VFSs:"
@@ -2818,68 +2841,68 @@
 
 #: src/boxes.c:674
 msgid " Virtual File System Setting "
-msgstr ""
+msgstr " Apontiaedje do forveyu sistinme di fitchîs "
 
 #: src/boxes.c:740
 msgid "Quick cd"
-msgstr ""
+msgstr "Abeye cd"
 
 #. want cd like completion
 #: src/boxes.c:745
 msgid "cd"
-msgstr ""
+msgstr "cd"
 
 #: src/boxes.c:796
 msgid "Symbolic link"
-msgstr ""
+msgstr "Loyén simbolike"
 
 #: src/boxes.c:833
 msgid "Running "
-msgstr ""
+msgstr "Èn alaedje "
 
 #: src/boxes.c:834 src/find.c:719 src/find.c:960
 msgid "Stopped"
-msgstr ""
+msgstr "Djoké"
 
 #: src/boxes.c:895
 msgid "&Stop"
-msgstr ""
+msgstr "&Håwe"
 
 #: src/boxes.c:896
 msgid "&Resume"
-msgstr ""
+msgstr "&Rataker"
 
 #: src/boxes.c:897
 msgid "&Kill"
-msgstr ""
+msgstr "&Touwer"
 
 #: src/boxes.c:936
 msgid "Background Jobs"
-msgstr ""
+msgstr "Bezognes di fond"
 
 #: src/chmod.c:95
 msgid "execute/search by others"
-msgstr ""
+msgstr "enonder/cweri påzès ôtes"
 
 #: src/chmod.c:96
 msgid "write by others"
-msgstr ""
+msgstr "sicrire påzès ôtes"
 
 #: src/chmod.c:97
 msgid "read by others"
-msgstr ""
+msgstr "lére påzès ôtes"
 
 #: src/chmod.c:98
 msgid "execute/search by group"
-msgstr ""
+msgstr "enonder/cweri på hopê"
 
 #: src/chmod.c:99
 msgid "write by group"
-msgstr ""
+msgstr "lére på hopê"
 
 #: src/chmod.c:100
 msgid "read by group"
-msgstr ""
+msgstr "sicrire på hopê"
 
 #: src/chmod.c:101
 msgid "execute/search by owner"
@@ -2919,7 +2942,7 @@
 
 #: src/chmod.c:152
 msgid "Permissions (Octal)"
-msgstr ""
+msgstr "Permissions (Octal)"
 
 #: src/chmod.c:154
 msgid "Owner name"
@@ -2927,43 +2950,43 @@
 
 #: src/chmod.c:156
 msgid "Group name"
-msgstr ""
+msgstr "No do hopê"
 
 #: src/chmod.c:160
 msgid " Chmod command "
-msgstr ""
+msgstr " Comande Chmod "
 
 #: src/chmod.c:162 src/chown.c:120
 msgid " Permission "
-msgstr ""
+msgstr " Permission "
 
 #: src/chmod.c:169
 msgid "Use SPACE to change"
-msgstr ""
+msgstr "Eployîz ESPÅCE po candjî"
 
 #: src/chmod.c:171
 msgid "an option, ARROW KEYS"
-msgstr ""
+msgstr "ene tchûze, les FLETCHES"
 
 #: src/chmod.c:173
 msgid "to move between options"
-msgstr ""
+msgstr "po bodjî d' ene tchûze a l' ôte"
 
 #: src/chmod.c:175
 msgid "and T or INS to mark"
-msgstr ""
+msgstr "eyèt T ou INS po mårker"
 
 #: src/chmod.c:233
 msgid "Chmod command"
-msgstr ""
+msgstr "Comande Chmod"
 
 #: src/chmod.c:321
 msgid " I can't run the Chmod command on an extfs "
-msgstr ""
+msgstr " Dji n' såreu fé on chmod so on extfs"
 
 #: src/chmod.c:325
 msgid " I can't run the Chmod command on a tarfs "
-msgstr ""
+msgstr " Dji n' såreu enonder li cmande Chmod so on tarfs "
 
 #: src/chown.c:81
 msgid "Set &users"
@@ -2975,7 +2998,7 @@
 
 #: src/chown.c:112
 msgid " Name "
-msgstr ""
+msgstr " No "
 
 #: src/chown.c:114
 msgid " Owner name "
@@ -2983,45 +3006,45 @@
 
 #: src/chown.c:116 src/chown.c:128
 msgid " Group name "
-msgstr ""
+msgstr " No do hopê "
 
 #: src/chown.c:118
 msgid " Size "
-msgstr ""
+msgstr " Grandeu "
 
 #: src/chown.c:124
 msgid " Chown command "
-msgstr ""
+msgstr " Comande chown "
 
 #: src/chown.c:126
 msgid " User name "
-msgstr ""
+msgstr " No di l' ûzeu "
 
 #: src/chown.c:192
 msgid "<Unknown user>"
-msgstr ""
+msgstr "<Ûzeu nén cnoxhu>"
 
 #. add fields for unknown names (numbers)
 #: src/chown.c:193
 msgid "<Unknown group>"
-msgstr ""
+msgstr "<Hopê nén cnoxhu>"
 
 #: src/chown.c:261
 msgid " I can't run the Chown command on an extfs "
-msgstr ""
+msgstr " Dji n' såreu enonder li cmande chown so èn extfs "
 
 #: src/chown.c:265
 msgid " I can't run the Chown command on a tarfs "
-msgstr ""
+msgstr " Dji n' såreu enonder li cmande chown so èn tarfs "
 
 #: src/cmd.c:198
 #, c-format
 msgid " Can not fetch a local copy of %s "
-msgstr ""
+msgstr " Dji n' sai aminer ene copeye locåle di %s "
 
 #: src/cmd.c:248
 msgid " CD "
-msgstr ""
+msgstr " CD "
 
 #: src/cmd.c:248
 msgid "Files tagged, want to cd?"
@@ -3029,63 +3052,63 @@
 
 #: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727
 msgid "Could not change directory"
-msgstr ""
+msgstr "Dji n' sai candjî di ridant"
 
 #: src/cmd.c:283
 msgid " View file "
-msgstr ""
+msgstr " Loukî è fitchî "
 
 #: src/cmd.c:283
 msgid " Filename:"
-msgstr ""
+msgstr " No do fitchî:"
 
 #: src/cmd.c:300
 msgid " Filtered view "
-msgstr ""
+msgstr " Vey passé "
 
 #: src/cmd.c:300
 msgid " Filter command and arguments:"
-msgstr ""
+msgstr " Comande po passer eyèt ses årgumints:"
 
 #: src/cmd.c:388
 msgid "Create a new Directory"
-msgstr ""
+msgstr "Fé on novea Ridant"
 
 #: src/cmd.c:388
 msgid " Enter directory name:"
-msgstr ""
+msgstr " No do ridant:"
 
 #: src/cmd.c:449
 msgid " Filter "
-msgstr ""
+msgstr " Passete "
 
 #: src/cmd.c:449
 msgid " Set expression for filtering filenames"
-msgstr ""
+msgstr " Diner ene ratoûrneure po passer les nos di fitchîs"
 
 #: src/cmd.c:515
 msgid " Select "
-msgstr ""
+msgstr " Tchwezi "
 
 #: src/cmd.c:567
 msgid " Unselect "
-msgstr ""
+msgstr " Distchwezi "
 
 #: src/cmd.c:640
 msgid "Extension file edit"
-msgstr ""
+msgstr "Aspougnî les cawetes di fitchîs"
 
 #: src/cmd.c:641
 msgid " Which extension file you want to edit? "
-msgstr ""
+msgstr " Kénès cawetes di fitchîs voloz-ve aspougnî? "
 
 #: src/cmd.c:642
 msgid "&User"
-msgstr ""
+msgstr "&Ûzeu"
 
 #: src/cmd.c:642 src/cmd.c:668
 msgid "&System Wide"
-msgstr ""
+msgstr "&Tot avå li Sistinme"
 
 #: src/cmd.c:665
 msgid "Menu file edit"
@@ -3097,15 +3120,15 @@
 
 #: src/cmd.c:668
 msgid "&Local"
-msgstr ""
+msgstr "&Locå"
 
 #: src/cmd.c:668
 msgid "&Home"
-msgstr ""
+msgstr "&Måjhon"
 
 #: src/cmd.c:853
 msgid " Compare directories "
-msgstr ""
+msgstr " Rimete les ridants "
 
 #: src/cmd.c:853
 msgid " Select compare method: "
@@ -3113,15 +3136,15 @@
 
 #: src/cmd.c:854
 msgid "&Quick"
-msgstr ""
+msgstr "A&beye"
 
 #: src/cmd.c:854
 msgid "&Size only"
-msgstr ""
+msgstr "Rén ki li &Grandeu"
 
 #: src/cmd.c:854
 msgid "&Thorough"
-msgstr ""
+msgstr "E&tir"
 
 #: src/cmd.c:864
 msgid " Both panels should be on the listing view mode to use this command "
@@ -3129,21 +3152,23 @@
 
 #: src/cmd.c:878
 msgid " The command history is empty "
-msgstr ""
+msgstr " I gn a rén è l' istwere des cmandes "
 
 #: src/cmd.c:884
 msgid " Command history "
-msgstr ""
+msgstr " Istwere des cmandes "
 
 #: src/cmd.c:926
 msgid ""
 " Not an xterm or Linux console; \n"
 " the panels cannot be toggled. "
 msgstr ""
+" Ci n' est nén on xterm ni ene conzole di Linux; \n"
+" dji n' såreu discandjî les paneas. "
 
 #: src/cmd.c:965
 msgid "Type `exit' to return to the Midnight Commander"
-msgstr ""
+msgstr "Tapez 'exit' po-z eraler a Midnight Commander"
 
 #: src/cmd.c:1020
 #, c-format
@@ -3154,22 +3179,23 @@
 
 #: src/cmd.c:1029 src/cmd.c:1031
 msgid " Link "
-msgstr ""
+msgstr " Loyén "
 
 #: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1685
 msgid " to:"
-msgstr ""
+msgstr " a:"
 
 #: src/cmd.c:1041
 #, c-format
 msgid " link: %s "
-msgstr ""
+msgstr " loyén: %s "
 
 #: src/cmd.c:1074
 #, c-format
 msgid " symlink: %s "
-msgstr ""
+msgstr " loyén simbolike: %s "
 
+#  &&&
 #: src/cmd.c:1128
 #, c-format
 msgid " Symlink `%s' points to: "
diff -ruN old/mc-4.5.34/src/ChangeLog new/mc-4.5.35/src/ChangeLog
--- old/mc-4.5.34/src/ChangeLog	Sun Jul  4 13:27:07 1999
+++ new/mc-4.5.35/src/ChangeLog	Mon Jul  5 21:18:57 1999
@@ -1,3 +1,8 @@
+1999-06-01  Robert Brady  <rwb197@ecs.soton.ac.uk>
+
+	* file.c (move_dir_dir): Give an error when an attempt is made to
+	move an empty directory into itself.
+
 1999-06-24  smil@linuxfan.com
 
 	* view.c (view_update_bytes_per_line, display): show correctly the
diff -ruN old/mc-4.5.34/vfs/ChangeLog new/mc-4.5.35/vfs/ChangeLog
--- old/mc-4.5.34/vfs/ChangeLog	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/vfs/ChangeLog	Mon Jul  5 21:18:55 1999
@@ -1,3 +1,12 @@
+1999-07-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* Make-mc.in (distcopy): Added a bunch of new lists of files for
+	the directories in vfs/samba.  Use them in this rule, because
+	plain wildcards will not work right.
+	(SAMBA_DIST_TOPLEVEL): Added configure to the list of distributed
+	files.
+	Added smbfs.[ch] to the list of sources.
+
 1999-07-02  Tuomas J. Lukka <lukka@iki.fi>
 
 	* Make-mc.in: $SAMBAFILES -> @SAMBAFILES@ in the rule
diff -ruN old/mc-4.5.34/vfs/Make-mc.in new/mc-4.5.35/vfs/Make-mc.in
--- old/mc-4.5.34/vfs/Make-mc.in	Sun Jul  4 13:27:06 1999
+++ new/mc-4.5.35/vfs/Make-mc.in	Mon Jul  5 21:18:55 1999
@@ -57,6 +57,7 @@
 
 SAMBA_DIST_TOPLEVEL =		\
 	Makefile.in		\
+	acconfig.h		\
 	aclocal.m4		\
 	architecture.doc	\
 	configure.in		\
@@ -64,9 +65,99 @@
 	internals.doc		\
 	parsing.doc		\
 	samba-files		\
-	smbadduser		\
-	acconfig.h		\
+	smbadduser
 
+SAMBA_DIST_INCLUDE =		\
+	byteorder.h		\
+	charset.h		\
+	client.h		\
+	config.h		\
+	config.h.in		\
+	dlinklist.h		\
+	includes.h		\
+	kanji.h			\
+	local.h			\
+	nameserv.h		\
+	ntdomain.h		\
+	nterr.h			\
+	proto.h			\
+	rpc_dce.h		\
+	rpc_lsa.h		\
+	rpc_misc.h		\
+	rpc_netlogon.h		\
+	rpc_reg.h		\
+	rpc_samr.h		\
+	rpc_secdes.h		\
+	rpc_srvsvc.h		\
+	rpc_wkssvc.h		\
+	rpcclient.h		\
+	smb.h			\
+	stamp-h			\
+	trans2.h		\
+	version.h
+
+SAMBA_DIST_LIB =		\
+	charcnv.c		\
+	charset.c		\
+	debug.c			\
+	doscalls.c		\
+	genrand.c		\
+	getsmbpass.c		\
+	interface.c		\
+	kanji.c			\
+	md4.c			\
+	netmask.c		\
+	signal.c		\
+	slprintf.c		\
+	system.c		\
+	time.c			\
+	username.c		\
+	util.c			\
+	util_file.c		\
+	util_sock.c		\
+	util_str.c		\
+	util_unistr.c
+
+SAMBA_DIST_LIBSMB =		\
+	clientgen.c		\
+	namequery.c		\
+	nmblib.c		\
+	nterr.c			\
+	pwd_cache.c		\
+	smbdes.c		\
+	smbencrypt.c		\
+	smberr.c
+
+SAMBA_DIST_PARAM =		\
+	loadparm.c		\
+	params.c
+
+SAMBA_DIST_SMBWRAPPER =		\
+	smbw.h
+
+SAMBA_DIST_TESTS =		\
+	README			\
+	crypttest.c		\
+	fcntl_lock.c		\
+	ftruncate.c		\
+	ftruncroot.c		\
+	getgroups.c		\
+	shared_mmap.c		\
+	summary.c		\
+	sysv_ipc.c		\
+	trapdoor.c		\
+	trivial.c
+
+SAMBA_DIST_UBIQX =		\
+	COPYING.LIB		\
+	README.UBI		\
+	debugparse.h		\
+	sys_include.h		\
+	ubi_BinTree.h		\
+	ubi_Cache.h		\
+	ubi_SplayTree.h		\
+	ubi_dLinkList.h		\
+	ubi_sLinkList.h
 
 NONETFILES = 			\
 	container.o		\
@@ -93,6 +184,7 @@
 	sfs.c 			\
 	shared_tar_ext.c 	\
 	shared_ftp_fish.c	\
+	smbfs.c			\
 	tar.c 			\
 	tcputil.c		\
 	undelfs.c 		\
@@ -107,6 +199,7 @@
 	ftpfs.h 		\
 	mcfs.h 			\
 	names.h 		\
+	smbfs.h			\
 	tar.h 			\
 	tcputil.h 		\
 	utilvfs.h		\
@@ -269,17 +362,19 @@
 	mkdir ../../mc-$(VERSION)/vfs/samba/include
 	mkdir ../../mc-$(VERSION)/vfs/samba/lib
 	mkdir ../../mc-$(VERSION)/vfs/samba/libsmb
-	mkdir ../../mc-$(VERSION)/vfs/samba/ubiqx
-	mkdir ../../mc-$(VERSION)/vfs/samba/tests
 	mkdir ../../mc-$(VERSION)/vfs/samba/param
+	mkdir ../../mc-$(VERSION)/vfs/samba/smbwrapper
+	mkdir ../../mc-$(VERSION)/vfs/samba/tests
+	mkdir ../../mc-$(VERSION)/vfs/samba/ubiqx
 
 	(cd samba; $(CP) $(SAMBA_DIST_TOPLEVEL) ../../../mc-$(VERSION)/vfs/samba)
-	(cd samba; $(CP) include/*.h ../../../mc-$(VERSION)/vfs/samba/include)
-	(cd samba; $(CP) lib/*.[ch] ../../../mc-$(VERSION)/vfs/samba/lib)
-	(cd samba; $(CP) libsmb/*.[ch] ../../../mc-$(VERSION)/vfs/samba/libsmb)
-	(cd samba; $(CP) ubiqx/*.[ch] ../../../mc-$(VERSION)/vfs/samba/ubiqx)
-	(cd samba; $(CP) tests/*.c ../../../mc-$(VERSION)/vfs/samba/tests)
-	(cd samba; $(CP) param/*.c ../../../mc-$(VERSION)/vfs/samba/param)
+	(cd samba/include; $(CP) $(SAMBA_DIST_INCLUDE)* ../../../../mc-$(VERSION)/vfs/samba/include)
+	(cd samba/lib; $(CP) $(SAMBA_DIST_LIB) ../../../../mc-$(VERSION)/vfs/samba/lib)
+	(cd samba/libsmb; $(CP) $(SAMBA_DIST_LIBSMB) ../../../../mc-$(VERSION)/vfs/samba/libsmb)
+	(cd samba/param; $(CP) $(SAMBA_DIST_PARAM) ../../../../mc-$(VERSION)/vfs/samba/param)
+	(cd samba/smbwrapper; $(CP) $(SAMBA_DIST_SMBWRAPPER) ../../../../mc-$(VERSION)/vfs/samba/smbwrapper)
+	(cd samba/tests; $(CP) $(SAMBA_DIST_TESTS) ../../../../mc-$(VERSION)/vfs/samba/tests)
+	(cd samba/ubiqx; $(CP) $(SAMBA_DIST_UBIQX) ../../../../mc-$(VERSION)/vfs/samba/ubiqx)
 	
 depend dep: mcdep
 
diff -ruN old/mc-4.5.34/vfs/samba/include/config.h.in new/mc-4.5.35/vfs/samba/include/config.h.in
--- old/mc-4.5.34/vfs/samba/include/config.h.in	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/samba/include/config.h.in	Mon Jul  5 21:18:55 1999
@@ -0,0 +1,886 @@
+/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define if type char is unsigned and you are not using gcc.  */
+#ifndef __CHAR_UNSIGNED__
+#undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
+
+/* Define if you have a working `mmap' system call.  */
+#undef HAVE_MMAP
+
+/* Define if your struct stat has st_rdev.  */
+#undef HAVE_ST_RDEV
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef mode_t
+
+/* Define if your C compiler doesn't accept -c and -o together.  */
+#undef NO_MINUS_C_MINUS_O
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+#undef off_t
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#undef TIME_WITH_SYS_TIME
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef uid_t
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+#undef HAVE_VOLATILE
+#undef HAVE_BROKEN_READDIR
+#undef HAVE_ERRNO_DECL
+#undef HAVE_LONGLONG
+#undef HAVE_OFF64_T
+#undef HAVE_REMSH
+#undef HAVE_UNSIGNED_CHAR
+#undef HAVE_UTIMBUF
+#undef HAVE_SIG_ATOMIC_T_TYPE
+#undef ssize_t
+#undef ino_t
+#undef ssize_t
+#undef loff_t
+#undef offset_t
+#undef aclent_t
+#undef HAVE_CONNECT
+#undef HAVE_SHORT_INO_T
+#undef WITH_SMBWRAPPER
+#undef WITH_AFS
+#undef WITH_DFS
+#undef SUNOS5
+#undef SUNOS4
+#undef LINUX
+#undef AIX
+#undef BSD
+#undef IRIX
+#undef IRIX6
+#undef HPUX
+#undef QNX
+#undef SCO
+#undef OSF1
+#undef NEXT2
+#undef RELIANTUNIX
+#undef HAVE_SHARED_MMAP
+#undef HAVE_MMAP
+#undef HAVE_SYSV_IPC
+#undef HAVE_FCNTL_LOCK
+#undef HAVE_FTRUNCATE_EXTEND
+#undef FTRUNCATE_NEEDS_ROOT
+#undef HAVE_TRAPDOOR_UID
+#undef HAVE_ROOT
+#undef HAVE_UNION_SEMUN
+#undef HAVE_NETMASK_IFCONF
+#undef HAVE_GETTIMEOFDAY_TZ
+#undef HAVE_SOCK_SIN_LEN
+#undef STAT_READ_FILSYS
+#undef STAT_STATFS2_BSIZE
+#undef STAT_STATFS2_FSIZE
+#undef STAT_STATFS2_FS_DATA
+#undef STAT_STATFS3_OSF1
+#undef STAT_STATFS4
+#undef STAT_STATVFS
+#undef STAT_STATVFS64
+#undef HAVE_NETMASK_IFREQ
+#undef HAVE_NETMASK_AIX
+#undef HAVE_CRYPT
+#undef HAVE_PUTPRPWNAM
+#undef HAVE_SET_AUTH_PARAMETERS
+#undef WITH_MMAP
+#undef WITH_SYSLOG
+#undef WITH_SSL
+#undef WITH_LDAP
+#undef WITH_NISPLUS
+#undef WITH_PAM
+#undef WITH_NISPLUS_HOME
+#undef WITH_AUTOMOUNT
+#undef WITH_SMBMOUNT
+#undef HAVE_BROKEN_GETGROUPS
+#undef REPLACE_GETPASS
+#undef REPLACE_INET_NTOA
+#undef HAVE_FILE_MACRO
+#undef HAVE_FUNCTION_MACRO
+#undef HAVE_SETRESUID_DECL
+#undef HAVE_CRYPT_DECL
+#undef HAVE_SETRESUID
+#undef WITH_NETATALK
+#undef HAVE_INO64_T
+#undef HAVE_STRUCT_FLOCK64
+#undef SIZEOF_INO_T
+#undef SIZEOF_OFF_T
+#undef STAT_STATVFS64
+#undef HAVE_LIBREADLINE
+#undef HAVE_KERNEL_OPLOCKS
+#undef HAVE_IRIX_SPECIFIC_CAPABILITIES
+#undef HAVE_INT16_FROM_RPC_RPC_H
+#undef HAVE_UINT16_FROM_RPC_RPC_H
+#undef HAVE_INT32_FROM_RPC_RPC_H
+#undef HAVE_UINT32_FROM_RPC_RPC_H
+#undef KRB4_AUTH
+#undef KRB5_AUTH
+#undef SEEKDIR_RETURNS_VOID
+#undef HAVE_DIRENT_D_OFF
+#undef HAVE_GETSPNAM
+#undef HAVE_BIGCRYPT
+#undef HAVE_GETPRPWNAM
+#undef HAVE_FSTAT64
+#undef HAVE_LSTAT64
+#undef HAVE_STAT64
+#undef HAVE_SETRESGID
+#undef HAVE_SETRESGID_DECL
+#undef HAVE_SHADOW_H
+#undef HAVE_MEMSET
+#undef HAVE_STRCASECMP
+#undef HAVE_STRUCT_DIRENT64
+#undef HAVE_TRUNCATED_SALT
+#undef BROKEN_NISPLUS_INCLUDE_FILES
+#undef HAVE_RPC_AUTH_ERROR_CONFLICT
+#undef HAVE_EXPLICIT_LARGEFILE_SUPPORT
+#undef USE_BOTH_CRYPT_CALLS
+
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
+
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
+
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
+
+/* Define if you have the __acl function.  */
+#undef HAVE___ACL
+
+/* Define if you have the __chdir function.  */
+#undef HAVE___CHDIR
+
+/* Define if you have the __close function.  */
+#undef HAVE___CLOSE
+
+/* Define if you have the __closedir function.  */
+#undef HAVE___CLOSEDIR
+
+/* Define if you have the __dup function.  */
+#undef HAVE___DUP
+
+/* Define if you have the __dup2 function.  */
+#undef HAVE___DUP2
+
+/* Define if you have the __facl function.  */
+#undef HAVE___FACL
+
+/* Define if you have the __fchdir function.  */
+#undef HAVE___FCHDIR
+
+/* Define if you have the __fcntl function.  */
+#undef HAVE___FCNTL
+
+/* Define if you have the __fork function.  */
+#undef HAVE___FORK
+
+/* Define if you have the __fstat function.  */
+#undef HAVE___FSTAT
+
+/* Define if you have the __fstat64 function.  */
+#undef HAVE___FSTAT64
+
+/* Define if you have the __fxstat function.  */
+#undef HAVE___FXSTAT
+
+/* Define if you have the __getcwd function.  */
+#undef HAVE___GETCWD
+
+/* Define if you have the __getdents function.  */
+#undef HAVE___GETDENTS
+
+/* Define if you have the __llseek function.  */
+#undef HAVE___LLSEEK
+
+/* Define if you have the __lseek function.  */
+#undef HAVE___LSEEK
+
+/* Define if you have the __lstat function.  */
+#undef HAVE___LSTAT
+
+/* Define if you have the __lstat64 function.  */
+#undef HAVE___LSTAT64
+
+/* Define if you have the __lxstat function.  */
+#undef HAVE___LXSTAT
+
+/* Define if you have the __open function.  */
+#undef HAVE___OPEN
+
+/* Define if you have the __open64 function.  */
+#undef HAVE___OPEN64
+
+/* Define if you have the __opendir function.  */
+#undef HAVE___OPENDIR
+
+/* Define if you have the __pread function.  */
+#undef HAVE___PREAD
+
+/* Define if you have the __pread64 function.  */
+#undef HAVE___PREAD64
+
+/* Define if you have the __pwrite function.  */
+#undef HAVE___PWRITE
+
+/* Define if you have the __pwrite64 function.  */
+#undef HAVE___PWRITE64
+
+/* Define if you have the __read function.  */
+#undef HAVE___READ
+
+/* Define if you have the __readdir function.  */
+#undef HAVE___READDIR
+
+/* Define if you have the __readdir64 function.  */
+#undef HAVE___READDIR64
+
+/* Define if you have the __seekdir function.  */
+#undef HAVE___SEEKDIR
+
+/* Define if you have the __stat function.  */
+#undef HAVE___STAT
+
+/* Define if you have the __stat64 function.  */
+#undef HAVE___STAT64
+
+/* Define if you have the __sys_llseek function.  */
+#undef HAVE___SYS_LLSEEK
+
+/* Define if you have the __telldir function.  */
+#undef HAVE___TELLDIR
+
+/* Define if you have the __write function.  */
+#undef HAVE___WRITE
+
+/* Define if you have the __xstat function.  */
+#undef HAVE___XSTAT
+
+/* Define if you have the _acl function.  */
+#undef HAVE__ACL
+
+/* Define if you have the _chdir function.  */
+#undef HAVE__CHDIR
+
+/* Define if you have the _close function.  */
+#undef HAVE__CLOSE
+
+/* Define if you have the _closedir function.  */
+#undef HAVE__CLOSEDIR
+
+/* Define if you have the _dup function.  */
+#undef HAVE__DUP
+
+/* Define if you have the _dup2 function.  */
+#undef HAVE__DUP2
+
+/* Define if you have the _facl function.  */
+#undef HAVE__FACL
+
+/* Define if you have the _fchdir function.  */
+#undef HAVE__FCHDIR
+
+/* Define if you have the _fcntl function.  */
+#undef HAVE__FCNTL
+
+/* Define if you have the _fork function.  */
+#undef HAVE__FORK
+
+/* Define if you have the _fstat function.  */
+#undef HAVE__FSTAT
+
+/* Define if you have the _fstat64 function.  */
+#undef HAVE__FSTAT64
+
+/* Define if you have the _getcwd function.  */
+#undef HAVE__GETCWD
+
+/* Define if you have the _getdents function.  */
+#undef HAVE__GETDENTS
+
+/* Define if you have the _llseek function.  */
+#undef HAVE__LLSEEK
+
+/* Define if you have the _lseek function.  */
+#undef HAVE__LSEEK
+
+/* Define if you have the _lstat function.  */
+#undef HAVE__LSTAT
+
+/* Define if you have the _lstat64 function.  */
+#undef HAVE__LSTAT64
+
+/* Define if you have the _open function.  */
+#undef HAVE__OPEN
+
+/* Define if you have the _open64 function.  */
+#undef HAVE__OPEN64
+
+/* Define if you have the _opendir function.  */
+#undef HAVE__OPENDIR
+
+/* Define if you have the _pread function.  */
+#undef HAVE__PREAD
+
+/* Define if you have the _pread64 function.  */
+#undef HAVE__PREAD64
+
+/* Define if you have the _pwrite function.  */
+#undef HAVE__PWRITE
+
+/* Define if you have the _pwrite64 function.  */
+#undef HAVE__PWRITE64
+
+/* Define if you have the _read function.  */
+#undef HAVE__READ
+
+/* Define if you have the _readdir function.  */
+#undef HAVE__READDIR
+
+/* Define if you have the _readdir64 function.  */
+#undef HAVE__READDIR64
+
+/* Define if you have the _seekdir function.  */
+#undef HAVE__SEEKDIR
+
+/* Define if you have the _stat function.  */
+#undef HAVE__STAT
+
+/* Define if you have the _stat64 function.  */
+#undef HAVE__STAT64
+
+/* Define if you have the _telldir function.  */
+#undef HAVE__TELLDIR
+
+/* Define if you have the _write function.  */
+#undef HAVE__WRITE
+
+/* Define if you have the atexit function.  */
+#undef HAVE_ATEXIT
+
+/* Define if you have the bigcrypt function.  */
+#undef HAVE_BIGCRYPT
+
+/* Define if you have the bzero function.  */
+#undef HAVE_BZERO
+
+/* Define if you have the chmod function.  */
+#undef HAVE_CHMOD
+
+/* Define if you have the chown function.  */
+#undef HAVE_CHOWN
+
+/* Define if you have the chroot function.  */
+#undef HAVE_CHROOT
+
+/* Define if you have the connect function.  */
+#undef HAVE_CONNECT
+
+/* Define if you have the creat64 function.  */
+#undef HAVE_CREAT64
+
+/* Define if you have the crypt function.  */
+#undef HAVE_CRYPT
+
+/* Define if you have the crypt16 function.  */
+#undef HAVE_CRYPT16
+
+/* Define if you have the dup2 function.  */
+#undef HAVE_DUP2
+
+/* Define if you have the endnetgrent function.  */
+#undef HAVE_ENDNETGRENT
+
+/* Define if you have the execl function.  */
+#undef HAVE_EXECL
+
+/* Define if you have the fopen64 function.  */
+#undef HAVE_FOPEN64
+
+/* Define if you have the fseek64 function.  */
+#undef HAVE_FSEEK64
+
+/* Define if you have the fseeko64 function.  */
+#undef HAVE_FSEEKO64
+
+/* Define if you have the fstat function.  */
+#undef HAVE_FSTAT
+
+/* Define if you have the fstat64 function.  */
+#undef HAVE_FSTAT64
+
+/* Define if you have the fsync function.  */
+#undef HAVE_FSYNC
+
+/* Define if you have the ftell64 function.  */
+#undef HAVE_FTELL64
+
+/* Define if you have the ftello64 function.  */
+#undef HAVE_FTELLO64
+
+/* Define if you have the ftruncate function.  */
+#undef HAVE_FTRUNCATE
+
+/* Define if you have the ftruncate64 function.  */
+#undef HAVE_FTRUNCATE64
+
+/* Define if you have the getauthuid function.  */
+#undef HAVE_GETAUTHUID
+
+/* Define if you have the getcwd function.  */
+#undef HAVE_GETCWD
+
+/* Define if you have the getdents function.  */
+#undef HAVE_GETDENTS
+
+/* Define if you have the getgrnam function.  */
+#undef HAVE_GETGRNAM
+
+/* Define if you have the getnetgrent function.  */
+#undef HAVE_GETNETGRENT
+
+/* Define if you have the getprpwnam function.  */
+#undef HAVE_GETPRPWNAM
+
+/* Define if you have the getpwanam function.  */
+#undef HAVE_GETPWANAM
+
+/* Define if you have the getrlimit function.  */
+#undef HAVE_GETRLIMIT
+
+/* Define if you have the getspnam function.  */
+#undef HAVE_GETSPNAM
+
+/* Define if you have the glob function.  */
+#undef HAVE_GLOB
+
+/* Define if you have the grantpt function.  */
+#undef HAVE_GRANTPT
+
+/* Define if you have the initgroups function.  */
+#undef HAVE_INITGROUPS
+
+/* Define if you have the innetgr function.  */
+#undef HAVE_INNETGR
+
+/* Define if you have the llseek function.  */
+#undef HAVE_LLSEEK
+
+/* Define if you have the lseek64 function.  */
+#undef HAVE_LSEEK64
+
+/* Define if you have the lstat64 function.  */
+#undef HAVE_LSTAT64
+
+/* Define if you have the memmove function.  */
+#undef HAVE_MEMMOVE
+
+/* Define if you have the memset function.  */
+#undef HAVE_MEMSET
+
+/* Define if you have the mktime function.  */
+#undef HAVE_MKTIME
+
+/* Define if you have the mmap64 function.  */
+#undef HAVE_MMAP64
+
+/* Define if you have the open64 function.  */
+#undef HAVE_OPEN64
+
+/* Define if you have the pathconf function.  */
+#undef HAVE_PATHCONF
+
+/* Define if you have the pipe function.  */
+#undef HAVE_PIPE
+
+/* Define if you have the pread function.  */
+#undef HAVE_PREAD
+
+/* Define if you have the pread64 function.  */
+#undef HAVE_PREAD64
+
+/* Define if you have the putprpwnam function.  */
+#undef HAVE_PUTPRPWNAM
+
+/* Define if you have the pwrite function.  */
+#undef HAVE_PWRITE
+
+/* Define if you have the pwrite64 function.  */
+#undef HAVE_PWRITE64
+
+/* Define if you have the rand function.  */
+#undef HAVE_RAND
+
+/* Define if you have the random function.  */
+#undef HAVE_RANDOM
+
+/* Define if you have the rdchk function.  */
+#undef HAVE_RDCHK
+
+/* Define if you have the readdir64 function.  */
+#undef HAVE_READDIR64
+
+/* Define if you have the rename function.  */
+#undef HAVE_RENAME
+
+/* Define if you have the select function.  */
+#undef HAVE_SELECT
+
+/* Define if you have the set_auth_parameters function.  */
+#undef HAVE_SET_AUTH_PARAMETERS
+
+/* Define if you have the setegid function.  */
+#undef HAVE_SETEGID
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
+/* Define if you have the seteuid function.  */
+#undef HAVE_SETEUID
+
+/* Define if you have the setgidx function.  */
+#undef HAVE_SETGIDX
+
+/* Define if you have the setgroups function.  */
+#undef HAVE_SETGROUPS
+
+/* Define if you have the setluid function.  */
+#undef HAVE_SETLUID
+
+/* Define if you have the setnetgrent function.  */
+#undef HAVE_SETNETGRENT
+
+/* Define if you have the setpriv function.  */
+#undef HAVE_SETPRIV
+
+/* Define if you have the setregid function.  */
+#undef HAVE_SETREGID
+
+/* Define if you have the setreuid function.  */
+#undef HAVE_SETREUID
+
+/* Define if you have the setsid function.  */
+#undef HAVE_SETSID
+
+/* Define if you have the setuidx function.  */
+#undef HAVE_SETUIDX
+
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
+
+/* Define if you have the sigblock function.  */
+#undef HAVE_SIGBLOCK
+
+/* Define if you have the sigprocmask function.  */
+#undef HAVE_SIGPROCMASK
+
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the srand function.  */
+#undef HAVE_SRAND
+
+/* Define if you have the srandom function.  */
+#undef HAVE_SRANDOM
+
+/* Define if you have the stat64 function.  */
+#undef HAVE_STAT64
+
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strchr function.  */
+#undef HAVE_STRCHR
+
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
+
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
+/* Define if you have the strftime function.  */
+#undef HAVE_STRFTIME
+
+/* Define if you have the strpbrk function.  */
+#undef HAVE_STRPBRK
+
+/* Define if you have the strtoul function.  */
+#undef HAVE_STRTOUL
+
+/* Define if you have the syscall function.  */
+#undef HAVE_SYSCALL
+
+/* Define if you have the usleep function.  */
+#undef HAVE_USLEEP
+
+/* Define if you have the utime function.  */
+#undef HAVE_UTIME
+
+/* Define if you have the utimes function.  */
+#undef HAVE_UTIMES
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
+/* Define if you have the waitpid function.  */
+#undef HAVE_WAITPID
+
+/* Define if you have the yp_get_default_domain function.  */
+#undef HAVE_YP_GET_DEFAULT_DOMAIN
+
+/* Define if you have the <arpa/inet.h> header file.  */
+#undef HAVE_ARPA_INET_H
+
+/* Define if you have the <compat.h> header file.  */
+#undef HAVE_COMPAT_H
+
+/* Define if you have the <ctype.h> header file.  */
+#undef HAVE_CTYPE_H
+
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the <glob.h> header file.  */
+#undef HAVE_GLOB_H
+
+/* Define if you have the <grp.h> header file.  */
+#undef HAVE_GRP_H
+
+/* Define if you have the <history.h> header file.  */
+#undef HAVE_HISTORY_H
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
+
+/* Define if you have the <net/if.h> header file.  */
+#undef HAVE_NET_IF_H
+
+/* Define if you have the <netinet/in_ip.h> header file.  */
+#undef HAVE_NETINET_IN_IP_H
+
+/* Define if you have the <netinet/in_systm.h> header file.  */
+#undef HAVE_NETINET_IN_SYSTM_H
+
+/* Define if you have the <netinet/tcp.h> header file.  */
+#undef HAVE_NETINET_TCP_H
+
+/* Define if you have the <poll.h> header file.  */
+#undef HAVE_POLL_H
+
+/* Define if you have the <readline.h> header file.  */
+#undef HAVE_READLINE_H
+
+/* Define if you have the <readline/history.h> header file.  */
+#undef HAVE_READLINE_HISTORY_H
+
+/* Define if you have the <readline/readline.h> header file.  */
+#undef HAVE_READLINE_READLINE_H
+
+/* Define if you have the <rpc/rpc.h> header file.  */
+#undef HAVE_RPC_RPC_H
+
+/* Define if you have the <rpcsvc/nis.h> header file.  */
+#undef HAVE_RPCSVC_NIS_H
+
+/* Define if you have the <rpcsvc/yp_prot.h> header file.  */
+#undef HAVE_RPCSVC_YP_PROT_H
+
+/* Define if you have the <rpcsvc/ypclnt.h> header file.  */
+#undef HAVE_RPCSVC_YPCLNT_H
+
+/* Define if you have the <security/pam_appl.h> header file.  */
+#undef HAVE_SECURITY_PAM_APPL_H
+
+/* Define if you have the <shadow.h> header file.  */
+#undef HAVE_SHADOW_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <stropts.h> header file.  */
+#undef HAVE_STROPTS_H
+
+/* Define if you have the <sys/acl.h> header file.  */
+#undef HAVE_SYS_ACL_H
+
+/* Define if you have the <sys/capability.h> header file.  */
+#undef HAVE_SYS_CAPABILITY_H
+
+/* Define if you have the <sys/cdefs.h> header file.  */
+#undef HAVE_SYS_CDEFS_H
+
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/dustat.h> header file.  */
+#undef HAVE_SYS_DUSTAT_H
+
+/* Define if you have the <sys/fcntl.h> header file.  */
+#undef HAVE_SYS_FCNTL_H
+
+/* Define if you have the <sys/filio.h> header file.  */
+#undef HAVE_SYS_FILIO_H
+
+/* Define if you have the <sys/filsys.h> header file.  */
+#undef HAVE_SYS_FILSYS_H
+
+/* Define if you have the <sys/fs/s5param.h> header file.  */
+#undef HAVE_SYS_FS_S5PARAM_H
+
+/* Define if you have the <sys/id.h> header file.  */
+#undef HAVE_SYS_ID_H
+
+/* Define if you have the <sys/ioctl.h> header file.  */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define if you have the <sys/mman.h> header file.  */
+#undef HAVE_SYS_MMAN_H
+
+/* Define if you have the <sys/mode.h> header file.  */
+#undef HAVE_SYS_MODE_H
+
+/* Define if you have the <sys/mount.h> header file.  */
+#undef HAVE_SYS_MOUNT_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/priv.h> header file.  */
+#undef HAVE_SYS_PRIV_H
+
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define if you have the <sys/security.h> header file.  */
+#undef HAVE_SYS_SECURITY_H
+
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/socket.h> header file.  */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define if you have the <sys/sockio.h> header file.  */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define if you have the <sys/statfs.h> header file.  */
+#undef HAVE_SYS_STATFS_H
+
+/* Define if you have the <sys/statvfs.h> header file.  */
+#undef HAVE_SYS_STATVFS_H
+
+/* Define if you have the <sys/syscall.h> header file.  */
+#undef HAVE_SYS_SYSCALL_H
+
+/* Define if you have the <sys/termio.h> header file.  */
+#undef HAVE_SYS_TERMIO_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/unistd.h> header file.  */
+#undef HAVE_SYS_UNISTD_H
+
+/* Define if you have the <sys/vfs.h> header file.  */
+#undef HAVE_SYS_VFS_H
+
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if you have the <syscall.h> header file.  */
+#undef HAVE_SYSCALL_H
+
+/* Define if you have the <termio.h> header file.  */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <utime.h> header file.  */
+#undef HAVE_UTIME_H
+
+/* Define if you have the dl library (-ldl).  */
+#undef HAVE_LIBDL
+
+/* Define if you have the inet library (-linet).  */
+#undef HAVE_LIBINET
+
+/* Define if you have the nsl library (-lnsl).  */
+#undef HAVE_LIBNSL
+
+/* Define if you have the nsl_s library (-lnsl_s).  */
+#undef HAVE_LIBNSL_S
+
+/* Define if you have the readline library (-lreadline).  */
+#undef HAVE_LIBREADLINE
+
+/* Define if you have the resolv library (-lresolv).  */
+#undef HAVE_LIBRESOLV
+
+/* Define if you have the sec library (-lsec).  */
+#undef HAVE_LIBSEC
+
+/* Define if you have the security library (-lsecurity).  */
+#undef HAVE_LIBSECURITY
+
+/* Define if you have the socket library (-lsocket).  */
+#undef HAVE_LIBSOCKET
diff -ruN old/mc-4.5.34/vfs/samba/include/stamp-h new/mc-4.5.35/vfs/samba/include/stamp-h
--- old/mc-4.5.34/vfs/samba/include/stamp-h	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/samba/include/stamp-h	Mon Jul  5 21:18:55 1999
@@ -0,0 +1 @@
+Tue Jun 22 20:51:34 UTC 1999
diff -ruN old/mc-4.5.34/vfs/samba/smbwrapper/smbw.h new/mc-4.5.35/vfs/samba/smbwrapper/smbw.h
--- old/mc-4.5.34/vfs/samba/smbwrapper/smbw.h	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/samba/smbwrapper/smbw.h	Mon Jul  5 21:18:56 1999
@@ -0,0 +1,62 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 2.0
+   SMB wrapper functions - definitions
+   Copyright (C) Andrew Tridgell 1998
+   
+   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 of the License, 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.
+*/
+
+#define SMBW_PREFIX "/smb/"
+#define SMBW_DUMMY "/dev/null"
+
+#define SMBW_CLI_FD 512
+#define SMBW_MAX_OPEN 8192
+
+#define SMBW_FILE_MODE (S_IFREG | 0444)
+#define SMBW_DIR_MODE (S_IFDIR | 0555)
+
+struct smbw_server {
+	struct smbw_server *next, *prev;
+	struct cli_state cli;
+	char *server_name;
+	char *share_name;
+	dev_t dev;
+	BOOL no_pathinfo2;
+};
+
+struct smbw_filedes {
+	int cli_fd;
+	int ref_count;
+	char *fname;
+	off_t offset;
+};
+
+struct smbw_file {
+	struct smbw_file *next, *prev;
+	struct smbw_filedes *f;
+	int fd;
+	struct smbw_server *srv;
+};
+
+struct smbw_dir {
+	struct smbw_dir *next, *prev;
+	int fd;
+	int offset, count, malloced;
+	struct smbw_server *srv;
+	struct file_info *list;
+	char *path;
+};
+
diff -ruN old/mc-4.5.34/vfs/samba/tests/README new/mc-4.5.35/vfs/samba/tests/README
--- old/mc-4.5.34/vfs/samba/tests/README	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/samba/tests/README	Mon Jul  5 21:18:56 1999
@@ -0,0 +1,10 @@
+This directory contains autoconf test programs that are too large to
+comfortably fit in configure.in.
+
+These programs should test one feature of the OS and exit(0) if it
+works or exit(1) if it doesn't work (do _not_ use return)
+
+The programs should be kept simple and to the point. Beautiful/fast
+code is not necessary
+
+
diff -ruN old/mc-4.5.34/vfs/samba/ubiqx/COPYING.LIB new/mc-4.5.35/vfs/samba/ubiqx/COPYING.LIB
--- old/mc-4.5.34/vfs/samba/ubiqx/COPYING.LIB	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/samba/ubiqx/COPYING.LIB	Mon Jul  5 21:18:56 1999
@@ -0,0 +1,481 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+                    675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff -ruN old/mc-4.5.34/vfs/samba/ubiqx/README.UBI new/mc-4.5.35/vfs/samba/ubiqx/README.UBI
--- old/mc-4.5.34/vfs/samba/ubiqx/README.UBI	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/samba/ubiqx/README.UBI	Mon Jul  5 21:18:56 1999
@@ -0,0 +1,18 @@
+Fri Apr 17 10:21:56 CDT 1998
+
+The C code files in the samba/source/ubiqx directory are licensed under
+the terms of the GNU LIBRARY GENERAL PUBLIC LICENSE (LGPL).  A copy of the
+LGPL should also be included in this directory under the name COPYING.LIB. 
+If this file is not present, you can obtain a copy of the LGPL by writing
+to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+USA. 
+
+The versions of the ubiqx modules distributed with Samba may have been
+modified for inclusion with Samba.  The main distribution, which contains
+additional available modules, can be found at: 
+
+  http://www.interads.co.uk/~crh/ubiqx/
+
+Chris Hertel
+Samba Team
+ubiqx@ubiqx.mn.org
diff -ruN old/mc-4.5.34/vfs/smbfs.c new/mc-4.5.35/vfs/smbfs.c
--- old/mc-4.5.34/vfs/smbfs.c	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/smbfs.c	Mon Jul  5 21:18:55 1999
@@ -0,0 +1,1747 @@
+/* Virtual File System: Midnight Commander file system.
+   
+   Copyright (C) 1995, 1996, 1997 The Free Software Foundation
+
+   Written by Wayne Roberts
+    <wroberts1@home.com>
+   
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License
+   as published by the Free Software Foundation; either version 2 of
+   the License, 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 Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Namespace: exports smbfs_vfs_ops, tcp_invalidate_socket */
+#include <stdio.h>
+#include <sys/types.h>
+#include "samba/include/config.h"
+#include "samba/include/includes.h"
+
+#include "../src/global.h"
+
+#include "../src/tty.h"         /* enable/disable interrupt key */
+#include "../src/main.h"
+
+#include "vfs.h"
+#include "smbfs.h"
+#include "tcputil.h"
+#include "../src/dialog.h"
+
+#define SMBFS_MAX_CONNECTIONS 16
+char *IPC = "IPC$";
+char *URL_HEADER = "/#smb:";
+#define HEADER_LEN	6
+
+static int my_errno;
+uint32 err;
+
+/* stuff that is same with each connection */
+extern int DEBUGLEVEL;
+static pstring myhostname;
+static pstring workgroup;
+mode_t myumask = 0755;
+extern pstring global_myname;
+static int smbfs_open_connections = 0;
+gboolean got_user = FALSE;
+gboolean got_pass = FALSE;
+pstring password;
+pstring username;
+
+static struct _smbfs_connection {
+	struct cli_state *cli;
+	struct in_addr dest_ip;
+	BOOL have_ip;
+	pstring password;
+	pstring service;	/* share name */
+    char *host;			/* server name */
+	char *user;
+	char *home;
+	int port;
+	int name_type;
+	time_t	last_use;
+} smbfs_connections [SMBFS_MAX_CONNECTIONS];
+/* unique to each connection */
+
+typedef struct _smbfs_connection smbfs_connection;
+smbfs_connection *current_bucket;
+
+typedef struct {
+	struct cli_state *cli;
+	int fnum;
+	off_t nread;
+	uint16 attr;
+} smbfs_handle;
+
+void
+smbfs_set_debug(int arg)
+{
+	DEBUGLEVEL = arg;
+}
+
+/********************** The callbacks ******************************/
+static int
+smbfs_init(vfs *me)
+{
+	char *servicesf = "/etc/smb.conf";
+
+/*	DEBUGLEVEL = 4;	*/
+
+	setup_logging("mc", True);
+    TimeInit();
+    charset_initialise();
+
+	DEBUG(3, ("smbfs_init(%s)\n", me->name));
+
+	if(!get_myname(myhostname,NULL))
+        DEBUG(0,("Failed to get my hostname.\n"));
+
+	if (!lp_load(servicesf,True,False,False))
+		DEBUG(0, ("Can't load %s - run testparm to debug it\n", servicesf));
+
+    codepage_initialise(lp_client_code_page());
+    pstrcpy(workgroup,lp_workgroup());
+	DEBUG(3, ("workgroup: %s\n", workgroup));
+
+    load_interfaces();
+    myumask = umask(0);
+    umask(myumask);
+
+    if (getenv("USER")) {
+		char *p;
+        pstrcpy(username, getenv("USER"));
+		got_user = TRUE;
+		DEBUG(3, ("smbfs_init(): $USER:%s\n", username));
+        if ((p = strchr(username, '%'))) {
+            *p = 0;
+            pstrcpy(password, p+1);
+            got_pass = TRUE;
+            memset(strchr(getenv("USER"), '%')+1, 'X', strlen(password));
+			DEBUG(3, ("smbfs_init(): $USER%%pass: %s%%%s\n",
+				username, password));
+        }
+        strupper(username);
+    }
+    if (getenv("PASSWD")) {
+        pstrcpy(password, getenv("PASSWD"));
+        got_pass = TRUE;
+    }
+	return 1;
+}
+
+static void
+smbfs_fill_names (vfs *me, void (*func)(char *))
+{
+	DEBUG(3, ("smbfs_fill_names()\n"));
+}
+
+#define CNV_LANG(s) dos_to_unix(s,False)
+/* does same as do_get() in client.c */
+/* called from vfs.c:1080, count = buffer size */
+static int
+smbfs_read (void *data, char *buffer, int count)
+{
+    smbfs_handle *info = (smbfs_handle *) data;
+	int n;
+
+	DEBUG(3, ("smbfs_read(fnum:%d, nread:%d, count:%d)\n",
+		info->fnum, (int)info->nread, count));
+	n = cli_read(info->cli, info->fnum, buffer, info->nread, count);
+	if (n > 0)
+		info->nread += n;
+	return n;
+}
+
+static int
+smbfs_write (void *data, char *buf, int nbyte)
+{
+    smbfs_handle *info = (smbfs_handle *) data;
+	int n;
+
+	DEBUG(3, ("smbfs_write(fnum:%d, nread:%d, nbyte:%d)\n",
+		info->fnum, (int)info->nread, nbyte));
+	n = cli_write(info->cli, info->fnum, 0, buf, info->nread, nbyte);
+	if (n > 0)
+		info->nread += n;
+    return n;
+}
+
+static int
+smbfs_close (void *data)
+{
+    smbfs_handle *info = (smbfs_handle *) data;
+	DEBUG(3, ("smbfs_close(fnum:%d)\n", info->fnum));
+/* if imlementing archive_level:	add rname to smbfs_handle
+    if (archive_level >= 2 && (inf->attr & aARCH)) {
+        cli_setatr(info->cli, rname, info->attr & ~(uint16)aARCH, 0);
+    }	*/
+	return cli_close(info->cli, info->fnum);
+}
+
+static int
+smbfs_errno (vfs *me)
+{
+	DEBUG(3, ("smbfs_errno: %s\n", g_strerror(my_errno)));
+    return my_errno;
+}
+
+typedef struct dir_entry {
+    char *text;
+    struct dir_entry *next;
+    struct stat my_stat;
+    int    merrno;
+} dir_entry;
+
+typedef struct {
+	gboolean server_list;
+	char *dirname;
+	char *path;	/* the dir orginally passed to smbfs_opendir */
+    smbfs_connection *conn;
+    dir_entry *entries;
+    dir_entry *current;
+} opendir_info;
+
+opendir_info
+	*previous_info,
+	*current_info,
+	*current_share_info,
+	*current_server_info;
+
+gboolean first_direntry;
+/* browse for shares on server */
+static void
+browsing_helper(const char *name, uint32 type, const char *comment)
+{
+	fstring typestr;
+	dir_entry *new_entry;
+	new_entry = g_new (dir_entry, 1);
+    new_entry->text = g_new0 (char, strlen(name)+1);
+	pstrcpy(new_entry->text, name);
+
+    new_entry->next = 0;
+
+	if (first_direntry) {
+		current_info->entries = new_entry;
+		current_info->current = new_entry;
+		first_direntry = FALSE;
+	} else {
+		current_info->current->next = new_entry;
+		current_info->current = new_entry;
+	}
+
+	bzero(&new_entry->my_stat, sizeof(struct stat));
+	new_entry->merrno = 0;
+	*typestr=0;
+	switch (type) {
+		case STYPE_DISKTREE:
+			fstrcpy(typestr,"Disk");
+			/*	show this as dir	*/
+			new_entry->my_stat.st_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IROTH;
+			break;
+		case STYPE_PRINTQ:
+			fstrcpy(typestr,"Printer"); break;
+		case STYPE_DEVICE:
+			fstrcpy(typestr,"Device"); break;
+		case STYPE_IPC:
+			fstrcpy(typestr, "IPC"); break;
+	}
+	DEBUG(3, ("\t%-15.15s%-10.10s%s\n", name, typestr,comment)); 
+}
+
+static void
+loaddir_helper(file_info *finfo, const char *mask)
+{
+	dir_entry *new_entry;
+	time_t t = finfo->mtime; /* the time is assumed to be passed as GMT */
+
+	if (finfo->mode & aHIDDEN)
+		return;	/* dont bother with hidden files, "~$" screws up mc */
+
+	new_entry = g_new (dir_entry, 1);
+    new_entry->text = g_new0 (char, strlen(finfo->name)+1);
+	pstrcpy(new_entry->text, finfo->name);
+
+    new_entry->next = 0;
+
+	if (first_direntry) {
+		current_info->entries = new_entry;
+		current_info->current = new_entry;
+		first_direntry = FALSE;
+	} else {
+		current_info->current->next = new_entry;
+		current_info->current = new_entry;
+	}
+
+	bzero(&new_entry->my_stat, sizeof(struct stat));
+	new_entry->my_stat.st_size = finfo->size;
+	new_entry->my_stat.st_mtime = finfo->mtime;
+	new_entry->my_stat.st_atime = finfo->atime;
+	new_entry->my_stat.st_ctime = finfo->ctime;
+	new_entry->my_stat.st_uid = finfo->uid;
+	new_entry->my_stat.st_gid = finfo->gid;
+
+
+	new_entry->my_stat.st_mode =	S_IRUSR|S_IRGRP|S_IROTH |
+									S_IWUSR|S_IWGRP|S_IWOTH;
+								
+/*  if (finfo->mode & aVOLID);	 nothing similar in real world */
+	if (finfo->mode & aDIR)
+		new_entry->my_stat.st_mode |= S_IFDIR;
+	else
+		new_entry->my_stat.st_mode |= S_IFREG;	/* if not dir, regular file? */
+/*  if (finfo->mode & aARCH);	DOS archive	*/
+/*  if (finfo->mode & aHIDDEN);	like a dot file? */
+/*  if (finfo->mode & aSYSTEM); like a kernel? */
+  if (finfo->mode & aRONLY)
+		new_entry->my_stat.st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH);
+ 
+	DEBUG(3, ("  %-30s%7.7s%8.0f  %s",
+		CNV_LANG(finfo->name),
+		attrib_string(finfo->mode),
+		(double)finfo->size,
+		asctime(LocalTime(&t)))); 
+}
+
+/* takes "/foo/bar/file" and gives "\\foo\\bar\\file" */
+static int
+convert_path(char **remote_file, gboolean trailing_asterik)
+{
+	char *p1, *p2;
+	char *my_remote;
+	char *rname = g_new(char, strlen(*remote_file)*2);
+	my_remote = g_new(char, strlen(*remote_file)+1);
+	my_remote = g_strdup(*remote_file);
+
+    if (strncmp (my_remote, URL_HEADER, HEADER_LEN) == 0) {	/* if passed directly */
+		my_remote += 6;
+		if (*my_remote == '/')		/* from server browsing */
+			my_remote++;
+		p1 = strchr(my_remote, '/');
+		if (p1)
+			my_remote = p1+1;	/* advance to end of server name */
+	}
+
+    if (*my_remote == '/')
+        my_remote++;  /* strip off leading '/' */
+    p1 = strchr(my_remote, '/');
+    if (p1)
+        my_remote = p1;   /* strip off share/service name */
+    /* create remote filename as understood by smb clientgen */
+    rname[0] = 0;
+    while ((p1 = strchr(my_remote, '/'))) {
+        pstrcat(rname, "\\");
+        p1++;
+        p2 = strchr(p1, '/');
+        if (p2) {
+            strncat(rname, p1, p2-p1);
+            my_remote = p2;
+        } else {    /* last time */
+            my_remote = p1;
+            pstrcat(rname, my_remote);
+        }
+    }
+	if (trailing_asterik)
+		pstrcat(rname, "\\*");	/* for directory listings */
+	*remote_file = g_strdup(rname);
+	return 0;
+}
+
+static void
+server_browsing_helper(const char *name, uint32 m, const char *comment)
+{
+	dir_entry *new_entry;
+	new_entry = g_new (dir_entry, 1);
+    new_entry->text = g_new0 (char, strlen(name)+1);
+	pstrcpy(new_entry->text, name);
+
+    new_entry->next = 0;
+
+	if (first_direntry) {
+		current_info->entries = new_entry;
+		current_info->current = new_entry;
+		first_direntry = FALSE;
+	} else {
+		current_info->current->next = new_entry;
+		current_info->current = new_entry;
+	}
+
+	bzero(&new_entry->my_stat, sizeof(struct stat));
+	new_entry->merrno = 0;
+
+	/*	show this as dir	*/
+	new_entry->my_stat.st_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IROTH;
+
+	DEBUG(3, ("\t%-16.16s     %s\n", name, comment));
+}
+
+static BOOL
+reconnect(smbfs_connection *conn, int *retries) {
+	char *host;
+	DEBUG(3, ("RECONNECT\n"));
+
+	if (strlen(conn->host) == 0)
+		host = g_strdup(conn->cli->desthost);		/* server browsing */
+	else
+		host = g_strdup(conn->host);
+
+	cli_shutdown(conn->cli);
+
+   	if (!(conn->cli = do_connect(host, conn->service))) {
+		my_errno = cli_error(conn->cli, NULL, &err, NULL);
+		message_2s (1, MSG_ERROR,
+			" reconnect to %s failed\n ", conn->host);
+		g_free(host);
+		return False;
+	}
+	g_free(host);
+	if (++(*retries) == 2)
+		return False;
+	return True;
+}
+
+static BOOL
+smb_send(struct cli_state *cli)
+{
+	size_t len;
+	size_t nwritten=0;
+	ssize_t ret;
+
+	len = smb_len(cli->outbuf) + 4;
+
+	while (nwritten < len) {
+		ret = write_socket(cli->fd, cli->outbuf+nwritten, len - nwritten);
+		if (ret <= 0 && errno == EPIPE)
+			return False;
+		nwritten += ret;
+	}
+	
+	return True;
+}
+
+/****************************************************************************
+See if server has cut us off by checking for EPIPE when writing.
+Taken from cli_chkpath()
+****************************************************************************/
+static BOOL
+chkpath(struct cli_state *cli, char *path, BOOL send_only)
+{
+	fstring path2;
+	char *p;
+	
+	fstrcpy(path2,path);
+	trim_string(path2,NULL,"\\");
+	if (!*path2) *path2 = '\\';
+	
+	memset(cli->outbuf,'\0',smb_size);
+	set_message(cli->outbuf,0,4 + strlen(path2),True);
+	SCVAL(cli->outbuf,smb_com,SMBchkpth);
+	SSVAL(cli->outbuf,smb_tid,cli->cnum);
+
+	cli->rap_error = 0;
+	cli->nt_error = 0;
+	SSVAL(cli->outbuf,smb_pid,cli->pid);
+	SSVAL(cli->outbuf,smb_uid,cli->vuid);
+	SSVAL(cli->outbuf,smb_mid,cli->mid);
+	if (cli->protocol > PROTOCOL_CORE) {
+		SCVAL(cli->outbuf,smb_flg,0x8);
+		SSVAL(cli->outbuf,smb_flg2,0x1);
+	}
+	
+	p = smb_buf(cli->outbuf);
+	*p++ = 4;
+	fstrcpy(p,path2);
+
+	if (!smb_send(cli)) {
+		DEBUG(3, ("chkpath: couldnt send\n"));
+		return False;
+	}
+	if (send_only) {
+		client_receive_smb(cli->fd, cli->inbuf, cli->timeout);
+		DEBUG(3, ("chkpath: send only OK\n"));
+		return True;	/* just testing for EPIPE */
+	}
+	if (!client_receive_smb(cli->fd, cli->inbuf, cli->timeout)) {
+		DEBUG(3, ("chkpath: receive error\n"));
+		return False;
+	}
+	if ((my_errno = cli_error(cli, NULL, NULL, NULL))) {
+		if (my_errno == 20 || my_errno == 13)
+			return True;	/* ignore if 'not a directory' error */
+		DEBUG(3, ("chkpath: cli_error: %s\n", g_strerror(my_errno)));
+		return False;
+	}
+
+	return True;
+}
+
+/* #if 0 */
+static int
+fs (char *text)
+{
+	char *p, count = 0;
+	p = strchr(text, '/');
+	while (p) {
+		count++;
+		p++;
+		p = strchr(p, '/');
+	}
+	if (count == 1)
+		return strlen(text);
+	return count;
+}
+/* #endif */
+
+static int
+smbfs_loaddir (opendir_info *smbfs_info)
+{
+	uint16 attribute = aDIR | aSYSTEM | aHIDDEN;
+	int servlen = strlen(smbfs_info->conn->service);
+	char *p;
+/*	int retries = 0;	*/
+	char *my_dirname = g_new(char, sizeof(smbfs_info->dirname)+1);
+	my_dirname = g_strdup(smbfs_info->dirname);
+	p = my_dirname;
+
+	DEBUG(3, ("smbfs_loaddir: dirname:%s\n", my_dirname));
+	first_direntry = TRUE;
+
+	if (current_info) {
+		DEBUG(3, ("smbfs_loaddir: new:'%s', cached:'%s'\n", my_dirname, current_info->dirname));
+		/* if new desired dir is longer than cached in current_info */
+		if (fs(my_dirname) > fs(current_info->dirname)) {
+			DEBUG(3, ("saving to previous_info\n"));
+			previous_info = current_info;
+		}
+	}
+
+	current_info = smbfs_info;
+
+	if (strcmp(my_dirname, "/") == 0) {
+		if (!strcmp(smbfs_info->path, URL_HEADER)) {
+			DEBUG(6, ("smbfs_loaddir: browsing %s\n", IPC));
+			/* browse for servers */
+			if (!cli_NetServerEnum(smbfs_info->conn->cli, workgroup,
+				SV_TYPE_ALL, server_browsing_helper))
+					return 0;
+			else
+				current_server_info = smbfs_info;
+			smbfs_info->server_list = TRUE;
+		} else {
+			/* browse for shares */
+			if (cli_RNetShareEnum(smbfs_info->conn->cli, browsing_helper) < 1)
+					return 0;
+			else
+				current_share_info = smbfs_info;
+		}
+		goto done;
+	}
+	/* do regular directory listing */
+	if(strncmp(smbfs_info->conn->service, my_dirname+1, servlen) == 0) {
+		/* strip share name from dir */
+		my_dirname += servlen;
+		*my_dirname = '/';
+	}
+	convert_path(&my_dirname, TRUE);
+
+	DEBUG(6, ("smbfs_loaddir: service: %s\n", smbfs_info->conn->service));
+	DEBUG(6, ("smbfs_loaddir: cli->share: %s\n", smbfs_info->conn->cli->share));
+	DEBUG(6, ("smbfs_loaddir: calling cli_list with mask %s\n", my_dirname));
+	/* do file listing: cli_list returns number of files */
+    if (cli_list(
+		smbfs_info->conn->cli, my_dirname, attribute, loaddir_helper) < 0) {
+		/* cli_list returns -1 if directory empty or cannot read socket */
+		my_errno = cli_error(smbfs_info->conn->cli, NULL, &err, NULL);
+		return 0;
+	}
+	if (strlen(my_dirname) == 0)
+		smbfs_info->dirname = smbfs_info->conn->service;
+	g_free(p);
+/*    do_dskattr();	*/
+
+done:
+/*	current_info->parent = smbfs_info->dirname;	*/
+    smbfs_info->current = smbfs_info->entries;
+	return 1; /* 1 = ok */
+}
+
+static void
+smbfs_free_dir (dir_entry *de)
+{
+    if (!de) return;
+
+    smbfs_free_dir (de->next);
+    g_free (de->text);
+    g_free (de);
+}
+
+/* Explanation:
+ * On some operating systems (Slowaris 2 for example)
+ * the d_name member is just a char long (Nice trick that break everything,
+ * so we need to set up some space for the filename.
+ */
+static struct {
+    struct dirent dent;
+#ifdef NEED_EXTRA_DIRENT_BUFFER
+    char extra_buffer [MC_MAXPATHLEN];
+#endif
+} smbfs_readdir_data;
+
+
+/* The readdir routine loads the complete directory */
+/* It's too slow to ask the server each time */
+/* It now also sends the complete lstat information for each file */
+static struct stat *cached_lstat_info;
+static void *
+smbfs_readdir (void *info)
+{
+    char *dirent_dest;
+	opendir_info  *smbfs_info = (opendir_info *) info;
+
+	DEBUG(4, ("smbfs_readdir(%s)\n", smbfs_info->dirname));
+	
+    if (!smbfs_info->entries)
+	    if (!smbfs_loaddir (smbfs_info))
+			return NULL;
+
+    if (smbfs_info->current == 0) {	/* reached end of dir entries */
+		DEBUG(3, ("smbfs_readdir: smbfs_info->current = 0\n"));
+/*	    cached_lstat_info = 0;
+	    smbfs_free_dir (smbfs_info->entries);
+	    smbfs_info->entries = 0;	*/
+	    return NULL;
+    }
+    dirent_dest = &(smbfs_readdir_data.dent.d_name [0]);
+    pstrcpy (dirent_dest, smbfs_info->current->text);
+    cached_lstat_info = &smbfs_info->current->my_stat;
+    smbfs_info->current = smbfs_info->current->next;
+
+#ifndef DIRENT_LENGTH_COMPUTED
+    smbfs_readdir_data.dent.d_namlen = strlen (smbfs_readdir_data.dent.d_name);
+#endif
+
+    return &smbfs_readdir_data; 
+}
+
+static int
+smbfs_closedir (void *info)
+{
+    opendir_info *smbfs_info = (opendir_info *) info;
+/*    dir_entry *p, *q;	*/
+
+	DEBUG(3, ("smbfs_closedir(%s)\n", smbfs_info->dirname));
+	/*	CLOSE HERE */
+    
+/*    for (p = smbfs_info->entries; p;){
+		q = p;
+		p = p->next;
+		g_free (q->text);
+		g_free (q);
+    }
+    g_free (info);	*/
+    return 0;
+}
+
+static int
+smbfs_chmod (vfs *me, char *path, int mode)
+{
+	DEBUG(3, ("smbfs_chmod(path:%s, mode:%d)\n", path, mode));
+/*	my_errno = EOPNOTSUPP;
+	return -1;	*/	/* cant chmod on smb filesystem */
+	return 0;		/* make mc happy */
+}
+
+static int
+smbfs_chown (vfs *me, char *path, int owner, int group)
+{
+	DEBUG(3, ("smbfs_chown(path:%s, owner:%d, group:%d)\n", path, owner, group));
+	my_errno = EOPNOTSUPP;	/* ready for your labotomy? */
+	return -1;
+}
+
+static int
+smbfs_utime (vfs *me, char *path, struct utimbuf *times)
+{
+	DEBUG(3, ("smbfs_utime(path:%s)\n", path));
+	my_errno = EOPNOTSUPP;
+    return -1;
+}
+
+static int
+smbfs_readlink (vfs *me, char *path, char *buf, int size)
+{
+	DEBUG(3, ("smbfs_readlink(path:%s, buf:%s, size:%d)\n", path, buf, size));
+	my_errno = EOPNOTSUPP;
+    return -1;	/* no symlinks on smb filesystem? */
+}
+
+static int
+smbfs_symlink (vfs *me, char *n1, char *n2)
+{
+	DEBUG(3, ("smbfs_symlink(n1:%s, n2:%s)\n", n1, n2));
+	my_errno = EOPNOTSUPP;
+    return -1;	/* no symlinks on smb filesystem? */
+}
+
+/* Extract the hostname and username from the path */
+/* path is in the form: hostname:user/remote-dir */
+static char *
+smbfs_get_host_and_username
+(char **path, char **host, char **user, int *port, char **pass)
+{
+/*	char *p, *ret;	*/
+	char *ret;
+
+    ret = vfs_split_url (*path, host, user, port, pass, SMB_PORT, 0);
+
+#if 0
+	if ((p = strchr(*path, '@')))	/* user:pass@server */
+		*path = ++p;				/* dont want user:pass@ in path */
+	if ((p = strchr(ret, '@')))	/* user:pass@server */
+		ret = ++p;				/* dont want user:pass@ in path */
+#endif
+
+	return ret;
+}
+
+/***************************************************** 
+	return a connection to a SMB server
+	current_bucket needs to be set before calling
+*******************************************************/
+struct cli_state *
+do_connect (char *server, char *share)
+{
+	struct cli_state *c;
+	struct nmb_name called, calling;
+	char *server_n;
+	struct in_addr ip;
+	extern struct in_addr ipzero;
+
+	DEBUG(3, ("do_connect(%s, %s)\n", server, share));
+	if (*share == '\\') {
+		server = share+2;
+		share = strchr(server,'\\');
+		if (!share) return NULL;
+		*share = 0;
+		share++;
+	}
+
+	server_n = server;
+	
+	ip = ipzero;
+
+	make_nmb_name(&calling, global_myname, 0x0, "");
+	make_nmb_name(&called , server, current_bucket->name_type, "");
+
+ again:
+	ip = ipzero;
+	if (current_bucket->have_ip) ip = current_bucket->dest_ip;
+
+	/* have to open a new connection */
+	if (!(c = cli_initialise(NULL))) {
+		my_errno = ENOMEM;
+		return NULL;
+	}
+
+	pwd_init(&(c->pwd));	/* should be moved into cli_initialise()? */
+	pwd_set_cleartext(&(c->pwd), current_bucket->password);
+
+	if ((cli_set_port(c, current_bucket->port) == 0) ||
+			!cli_connect(c, server_n, &ip)) {
+		my_errno = cli_error(c, NULL, &err, NULL);
+		DEBUG(1, ("Connection to %s failed\n", server_n));
+		return NULL;
+	}
+
+	if (!cli_session_request(c, &calling, &called)) {
+		my_errno = cli_error(c, NULL, &err, NULL);
+		DEBUG(1, ("session request to %s failed\n", called.name));
+		cli_shutdown(c);
+		if (strcmp(called.name, "*SMBSERVER")) {
+			make_nmb_name(&called , "*SMBSERVER", 0x20, "");
+			goto again;
+		}
+		return NULL;
+	}
+
+	DEBUG(3, (" session request ok\n"));
+
+	if (!cli_negprot(c)) {
+		my_errno = cli_error(c, NULL, &err, NULL);
+		DEBUG(1, ("protocol negotiation failed\n"));
+		cli_shutdown(c);
+		return NULL;
+	}
+
+	if (!cli_session_setup(c, current_bucket->user, 
+			       current_bucket->password, strlen(current_bucket->password),
+			       current_bucket->password, strlen(current_bucket->password),
+			       workgroup)) {
+		my_errno = cli_error(c, NULL, &err, NULL);
+		DEBUG(1,("session setup failed: %s\n", cli_errstr(c)));
+		return NULL;
+	}
+
+	if (*c->server_domain || *c->server_os || *c->server_type)
+		DEBUG(5,("Domain=[%s] OS=[%s] Server=[%s]\n",
+			c->server_domain,c->server_os,c->server_type));
+	
+	DEBUG(3, (" session setup ok\n"));
+
+	if (!cli_send_tconX(c, share, "?????",
+			    current_bucket->password, strlen(current_bucket->password)+1)) {
+		my_errno = cli_error(c, NULL, &err, NULL);
+		DEBUG(1,("%s: tree connect failed: %s\n", share, cli_errstr(c)));
+		cli_shutdown(c);
+		return NULL;
+	}
+
+	DEBUG(3, (" tconx ok\n"));
+
+	my_errno = 0;
+	return c;
+}
+
+static int
+get_master_browser(char **host)
+{
+	int count;
+	struct in_addr *ip_list, bcast_addr, ipzero;
+	/* does port = 137 for win95 master browser? */
+	int fd= open_socket_in( SOCK_DGRAM, 0, 3,
+                             interpret_addr(lp_socket_address()), True ); 
+	if (fd == -1)
+		return 0;
+	set_socket_options(fd, "SO_BROADCAST");
+	ip_list = iface_bcast(ipzero);
+	bcast_addr = *ip_list;
+	if ((ip_list = name_query(fd, "\01\02__MSBROWSE__\02", 1, True, 
+		True, bcast_addr, &count, NULL))) {
+		if (!count)
+			return 0;
+		/* just return first master browser */
+		*host = g_strdup(inet_ntoa(ip_list[0]));
+		return 1;
+	}
+	return 0;
+}
+
+static int smbfs_get_free_bucket_init = 1;
+
+static smbfs_connection *
+smbfs_get_free_bucket ()
+{
+    int i;
+    
+    if (smbfs_get_free_bucket_init) {
+		smbfs_get_free_bucket_init = 0;
+		for (i = 0; i < SMBFS_MAX_CONNECTIONS; i++)
+	    	smbfs_connections [i].cli = 0;
+    }
+    for (i = 0; i < SMBFS_MAX_CONNECTIONS; i++)
+		if (!smbfs_connections [i].cli) return &smbfs_connections [i];
+
+	{	/* search for most dormant connection */
+		int oldest;	/* index */
+		time_t oldest_time = time(NULL);
+		for (i = 0; i< SMBFS_MAX_CONNECTIONS; i++) {
+			if (smbfs_connections[i].last_use < oldest_time) {
+				oldest_time = smbfs_connections[i].last_use;
+				oldest = i;
+			}
+		}
+		cli_shutdown(smbfs_connections[oldest].cli);
+		return &smbfs_connections[oldest];
+	}
+
+    /* This can't happend, since we have checked for max connections before */
+    vfs_die("Internal error: smbfs_get_free_bucket");
+    return 0;	/* shut up, stupid gcc */
+}
+
+/* This routine keeps track of open connections */
+/* Returns a connected socket to host */
+static smbfs_connection *
+smbfs_open_link(char *host, char *path, char *user, int *port, char *this_pass)
+{
+    int i;
+    smbfs_connection *bucket;
+	pstring service;
+	struct in_addr *dest_ip = NULL;
+
+	DEBUG(3, ("smbfs_open_link(host:%s, path:%s)\n", host, path));
+
+	if (strcmp(host, path) == 0)	/* if host & path are same: */
+		pstrcpy(service, IPC);		/* setup for browse */
+	else {	/* get share name from path, path starts with server name */
+		char *p;
+		if ((p = strchr(path, '/')))	/* get share aka				*/
+			pstrcpy(service, ++p);	/* service name from path		*/
+
+		/* now check for trailing directory/filenames	*/
+		p = strchr(service, '/');
+		if (p)
+			*p = 0;				/* cut off dir/files: sharename only */
+
+		DEBUG(6, ("smbfs_open_link: service from path:%s\n", service));
+	}
+
+	if (got_user)
+		user = g_strdup(username);	/* global from getenv */
+
+    /* Is the link actually open? */
+    if (smbfs_get_free_bucket_init) {
+        smbfs_get_free_bucket_init = 0;
+        for (i = 0; i < SMBFS_MAX_CONNECTIONS; i++)
+	    	smbfs_connections [i].cli = 0;
+    } else for (i = 0; i < SMBFS_MAX_CONNECTIONS; i++) {
+		if (!smbfs_connections[i].cli)
+		    continue;
+		if ((strcmp (host, smbfs_connections [i].host) == 0) &&
+		    (strcmp (user, smbfs_connections [i].user) == 0) &&
+		    (strcmp (service, smbfs_connections [i].service) == 0)) {
+			int retries = 0;
+			BOOL inshare = (*host != 0 && *path != 0 && strchr(path, '/'));
+			/* check if this connection has died */
+			while (!chkpath(smbfs_connections[i].cli, "\\", !inshare)) {
+				if (!reconnect(&smbfs_connections[i], &retries))
+					return 0;
+			}
+			DEBUG(6, ("smbfs_open_link: returning smbfs_connection[%d]\n", i));
+			current_bucket = &smbfs_connections[i];
+			smbfs_connections [i].last_use = time(NULL);
+		    return &smbfs_connections [i];
+		}
+		/* connection not found, find if we have ip for new connection */
+		if (strcmp (host, smbfs_connections [i].host) == 0)
+			dest_ip = &smbfs_connections[i].cli->dest_ip;
+    }
+
+	/* make new connection */
+    bucket = smbfs_get_free_bucket ();
+	bucket->name_type = 0x20;
+    bucket->home = 0;
+	bucket->port = *port;
+	bucket->have_ip = False;
+	if (dest_ip) {
+		bucket->have_ip = True;
+		bucket->dest_ip = *dest_ip;
+	}
+	current_bucket = bucket;
+
+	bucket->user = g_strdup(user);
+	if (got_pass)
+		pstrcpy(bucket->password, password);	/* global from getenv */
+	else
+		pstrcpy(bucket->password, this_pass);
+
+	if (!strlen(host)) {	/* if blank host name, browse for servers */
+		if (!get_master_browser(&host))	/* set host to ip of master browser */
+			return 0;		/* couldnt find master browser? */
+		bucket->host = g_strdup("");	/* blank host means master browser */
+	} else
+		bucket->host = g_strdup(host);
+
+	/* connect to share */
+    if (!(bucket->cli = do_connect(host, service)))
+		return 0;
+	pstrcpy(bucket->service, service);
+
+    smbfs_open_connections++;
+    DEBUG(3, ("smbfs_open_link:smbfs_open_connections: %d\n",
+		smbfs_open_connections));
+    return bucket;
+}
+
+static char *
+smbfs_get_path(smbfs_connection **sc, char *path)
+{
+	char *user, *host, *remote_path, *pass;
+	int port = SMB_PORT;
+
+	DEBUG(3, ("smbfs_get_path(%s)\n", path));
+    if (strncmp (path, URL_HEADER, HEADER_LEN))
+        return NULL;
+    path += HEADER_LEN;
+
+	if (*path == '/')	/* '/' leading server name */
+		path++;			/* probably came from server browsing */
+
+	if ((remote_path = smbfs_get_host_and_username(
+		&path, &host, &user, &port, &pass)))  
+		if ((*sc = smbfs_open_link (host, path, user, &port, pass)) == NULL){
+			g_free (remote_path);
+			remote_path = NULL;
+		}
+    g_free (host);
+    g_free (user);
+    if (pass) wipe_password (pass);
+
+    if (!remote_path) return NULL;
+
+    /* NOTE: tildes are deprecated. See ftpfs.c */
+    {
+        int f = !strcmp( remote_path, "/~" );
+	    if (f || !strncmp( remote_path, "/~/", 3 )) {
+			char *s;
+	        s = concat_dir_and_file( (*sc)->home, remote_path +3-f );
+			g_free (remote_path);
+			remote_path = s;
+		}
+	}
+	return remote_path;
+}
+
+static int
+is_error (int result, int errno_num)
+{
+    if (!(result == -1))
+		return my_errno = 0;
+    else 
+		my_errno = errno_num;
+    return 1;
+}
+
+static void *
+smbfs_opendir (vfs *me, char *dirname)
+{
+    opendir_info *smbfs_info;
+	smbfs_connection *sc;
+	char *remote_dir;
+
+	DEBUG(3, ("smbfs_opendir(dirname:%s)\n", dirname));
+
+    if (!(remote_dir = smbfs_get_path (&sc, dirname)))
+		return NULL;
+
+	/* FIXME: where freed? */
+    smbfs_info = g_new (opendir_info, 1);
+	smbfs_info->server_list = FALSE;
+    smbfs_info->path = g_new (char, strlen(dirname)+1);
+    smbfs_info->path = g_strdup(dirname);		/* keep original */
+	smbfs_info->dirname = remote_dir;
+    smbfs_info->conn = sc;
+    smbfs_info->entries = 0;
+    smbfs_info->current = 0;
+
+    return smbfs_info;
+}
+
+static int
+fake_server_stat(char *server_url, char *path, struct stat *buf)
+{
+	dir_entry *dentry;
+	char *p;
+
+	while ((p = strchr(path, '/')))
+		path++;		/* advance until last '/' */
+
+	if (!current_info->entries) {
+		if (!smbfs_loaddir(current_info));	/* browse host */
+			return -1;
+	}
+	dentry = current_info->entries;
+	DEBUG(4, ("fake stat for SERVER \"%s\"\n", path));
+	while (dentry) {
+		if (strcmp(dentry->text, path) == 0) {
+			DEBUG(4, ("fake_server_stat: %s:%d\n",
+				dentry->text, dentry->my_stat.st_mode));
+			memcpy(buf, &dentry->my_stat, sizeof(struct stat));
+			return 0;
+		}
+		dentry = dentry->next;
+	}
+	my_errno = ENOENT;
+	return -1;
+}
+
+static int
+fake_share_stat(char *server_url, char *path, struct stat *buf)
+{
+	dir_entry *dentry;
+	if (strlen(path) < strlen(server_url))
+		return -1;
+	path += strlen(server_url);	/*	we only want share name	*/
+	path++;
+
+	if (*path == '/')	/* '/' leading server name */
+		path++;			/* probably came from server browsing */
+
+	if (!current_share_info->entries) {
+		if (!smbfs_loaddir(current_share_info));	/* browse host */
+			return -1;
+	}
+	dentry = current_share_info->entries;
+	DEBUG(3, ("fake_share_stat: %s on %s\n", path, server_url));
+	while (dentry) {
+		if (strcmp(dentry->text, path) == 0) {
+			DEBUG(6, ("fake_share_stat: %s:%d\n",
+				dentry->text, dentry->my_stat.st_mode));
+			memcpy(buf, &dentry->my_stat, sizeof(struct stat));
+			return 0;
+		}
+		dentry = dentry->next;
+	}
+	my_errno = ENOENT;
+	return -1;
+}
+
+/* stat a single file, get_remote_stat callback  */
+dir_entry *single_entry;
+static void
+statfile_helper(file_info *finfo, const char *mask)
+{
+	time_t t = finfo->mtime; /* the time is assumed to be passed as GMT */
+	single_entry = g_new (dir_entry, 1);
+    single_entry->text = g_new0 (char, strlen(finfo->name)+1);
+	pstrcpy(single_entry->text, finfo->name);
+
+    single_entry->next = 0;
+	single_entry->my_stat.st_size = finfo->size;
+	single_entry->my_stat.st_mtime = finfo->mtime;
+	single_entry->my_stat.st_atime = finfo->atime;
+	single_entry->my_stat.st_ctime = finfo->ctime;
+	single_entry->my_stat.st_uid = finfo->uid;
+	single_entry->my_stat.st_gid = finfo->gid;
+
+	single_entry->my_stat.st_mode =	S_IRUSR|S_IRGRP|S_IROTH |
+									S_IWUSR|S_IWGRP|S_IWOTH;
+								
+/*  if (finfo->mode & aVOLID);	 nothing similar in real world */
+	if (finfo->mode & aDIR)
+		single_entry->my_stat.st_mode |= S_IFDIR;
+	else
+		single_entry->my_stat.st_mode |= S_IFREG;/* if not dir, regular file? */
+/*  if (finfo->mode & aARCH);	DOS archive	*/
+/*  if (finfo->mode & aHIDDEN);	like a dot file? */
+/*  if (finfo->mode & aSYSTEM); like a kernel? */
+  if (finfo->mode & aRONLY)
+		single_entry->my_stat.st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH);
+ 
+	DEBUG(6, ("  %-30s%7.7s%8.0f  %s",
+		CNV_LANG(finfo->name),
+		attrib_string(finfo->mode),
+		(double)finfo->size,
+		asctime(LocalTime(&t)))); 
+}
+
+/* stat a single file */
+static int
+get_remote_stat(smbfs_connection *sc, char *path, struct stat *buf)
+{
+	uint16 attribute = aDIR | aSYSTEM | aHIDDEN;
+	char *mypath = g_new(char, sizeof(path)+1);
+	mypath = g_strdup(path);
+
+	DEBUG(3, ("get_remote_stat(): mypath:%s\n", mypath));
+
+	convert_path(&mypath, FALSE);
+
+    if (cli_list(sc->cli, mypath, attribute, statfile_helper) < 1) {
+		my_errno = ENOENT;
+		return -1;	/* cli_list returns number of files */
+	}
+
+	memcpy(buf, &single_entry->my_stat, sizeof(struct stat));
+
+/* dont free here, use for smbfs_fstat() */
+/*	g_free(single_entry->text);
+	g_free(single_entry);	*/
+	return 0;
+}
+
+static int
+search_dir_entry (dir_entry *dentry, char *text, struct stat *buf)
+{
+	while (dentry) {
+		if (strcmp(text, dentry->text) == 0) {
+			memcpy(buf, &dentry->my_stat, sizeof(struct stat));
+			return 0;
+		}
+		dentry = dentry->next;
+	}
+	return -1;
+}
+
+static int
+get_stat_info (smbfs_connection *sc, char *path, struct stat *buf)
+{
+	char *p, *mpp;
+	dir_entry *dentry = current_info->entries;
+	char *mypath = g_new(char, strlen(path)+1);
+	mpp = mypath = g_strdup(path);
+
+	mypath++;				/* cut off leading '/' */
+	while ((p = strchr(mypath, '/')))
+		mypath++;			/* advance until last file/dir name */
+	DEBUG(3, ("get_stat_info: mypath:%s, current_info->dirname:%s\n",
+		mypath, current_info->dirname));
+#if 0
+	if (!dentry) {
+		DEBUG(1, ("No dir entries (empty dir) cached:'%s', wanted:'%s'\n", current_info->dirname, path));
+		return -1;
+	}
+#endif
+	if (search_dir_entry(current_info->entries, mypath, buf) == 0)
+		return 0;
+		/* now try to identify mypath as PARENT dir */
+	{
+		char *mdp;
+		char *mydir = g_new(char, strlen(current_info->dirname)+1);
+		mdp = mydir = g_strdup(current_info->dirname);
+		while ((p = strchr(mydir, '/')))
+			mydir++;				/* advance util last '/' */
+		mydir--;
+		*mydir = 0;					/* cut off last name	*/
+		mydir = mdp;				/* reset to start */
+		while ((p = strchr(mydir, '/')))
+			mydir++;				/* advance util last '/' */
+		if (strcmp(mydir, mypath) == 0) {	/* fake a stat for ".." */
+			struct stat fake_stat;
+			bzero(&fake_stat, sizeof(struct stat));
+			fake_stat.st_mode = S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH;
+			memcpy(buf, &fake_stat, sizeof(struct stat));
+			g_free(mdp);
+			g_free(mpp);
+			DEBUG(1, ("	PARENT:found in %s\n", current_info->dirname));
+			return 0;
+		}
+		g_free(mdp);
+	}
+		/* now try to identify as CURRENT dir? */
+	{
+		char *dnp = current_info->dirname;
+		DEBUG(6, ("get_stat_info: is %s current dir? this dir is: %s\n",
+			mypath, current_info->dirname));
+		if (*dnp == '/')
+			dnp++;
+		else {
+			g_free(mpp);
+			return -1;
+		}
+		if (strcmp(mypath, dnp) == 0) {
+			struct stat fake_stat;
+			bzero(&fake_stat, sizeof(struct stat));
+			fake_stat.st_mode = S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH;
+			memcpy(buf, &fake_stat, sizeof(struct stat));
+			g_free(mpp);
+			DEBUG(1, ("	CURRENT:found in %s\n", current_info->dirname));
+			return 0;
+		}
+	}
+	DEBUG(3, ("'%s' not found in current_info '%s'\n", path, current_info->dirname));
+	/* try to find this in the PREVIOUS listing */
+	if (previous_info) {
+		if (search_dir_entry(previous_info->entries, mypath, buf) == 0)
+			return 0;
+		DEBUG(3, ("'%s' not found in previous_info '%s'\n", path, previous_info->dirname));
+	}
+	/* try to find this in the SHARE listing */
+	if (current_share_info && search_dir_entry(current_share_info->entries, mypath, buf) == 0)
+		return 0;
+	DEBUG(3, ("'%s' not found in share_info '%s'\n", path, current_share_info->dirname));
+	/* try to find this in the SERVER listing */
+	if (current_server_info && search_dir_entry(current_server_info->entries, mypath, buf) == 0)
+		return 0;
+	DEBUG(3, ("'%s' not found in server_info '%s'\n", path, current_server_info->dirname));
+	/* nothing found. get stat file info from server */
+	g_free(mpp);
+	return get_remote_stat(sc, path, buf);
+}
+
+static int
+smbfs_chdir (vfs *me, char *path)
+{
+	char *remote_dir;
+	smbfs_connection *sc;
+	
+	DEBUG(3, ("smbfs_chdir(path:%s)\n", path));
+    if (!(remote_dir = smbfs_get_path (&sc, path)))
+		return -1;
+	
+    return 0;
+}
+
+static int 
+loaddir(vfs *me, char *path)
+{
+	void *info;
+	char *mypath, *p;
+	mypath = g_new(char, strlen(path)+1);
+	mypath = g_strdup(path);
+	p = mypath;
+	if (*p == '/')
+		p++;
+	while (strchr(p, '/'))
+		p++;
+	if (p-mypath > 1)
+		*--p = 0;
+	DEBUG(6, ("loaddir(%s)\n", mypath));
+	smbfs_chdir(me, mypath);
+	info = smbfs_opendir (me, mypath);
+	g_free(mypath);
+	if (!info)
+		return -1;
+	smbfs_readdir(info);
+	smbfs_loaddir(info);
+	return 0;
+}
+
+static int
+smbfs_stat (vfs *me, char *path, struct stat *buf)
+{
+	char *remote_dir;
+	smbfs_connection *sc;
+	pstring server_url;
+	char *server, *service, *p, *mypath, *pp;
+	BOOL no_share = False;
+
+	DEBUG(3, ("smbfs_stat(path:%s)\n", path));
+
+#if 0
+	if (p = strchr(path, '@'))	/* user:pass@server */
+		path = ++p;				/* dont want user:pass@ in path */
+#endif
+
+	if (!current_info) {
+		DEBUG(1, ("current_info = NULL: "));
+		if (loaddir(me, path) < 0)
+			return -1;
+	}
+
+	pstrcpy(server_url, URL_HEADER);
+	pstrcat(server_url, current_bucket->host);
+
+	/* check if stating server */
+	mypath = g_new(char, strlen(path)+1);
+	mypath = g_strdup(path);
+	p = mypath;
+	if (strncmp(p, URL_HEADER, HEADER_LEN)) {
+		DEBUG(1, ("'%s' doesnt start with '%s' (length %d)\n",
+			p, URL_HEADER, HEADER_LEN));
+		return -1;
+	} else
+		p += HEADER_LEN;
+	if (*p == '/')
+		p++;
+	if (!strchr(p, '/')) {
+		g_free(mypath);
+		if (!current_info->server_list) {
+			if (loaddir(me, path) < 0)
+				return -1;
+		}
+		return fake_server_stat(server_url, path, buf);
+	}
+	if (strlen(p) == 0)
+		DEBUG(1, ("zero length p, mypath:'%s'", mypath));
+	p = strchr(p, '/');	/* advance past next '/' */
+	p++;
+	if (!strchr(p, '/')) {
+		g_free(mypath);
+		return fake_share_stat(server_url, path, buf);
+	}
+	g_free(mypath);
+
+	/* stating inside share at this point */
+    if (!(remote_dir = smbfs_get_path (&sc, path))) /* connects if necessary */
+		return -1;
+
+	{
+		char *sp, *pp = path;
+		int hostlen = strlen(current_bucket->host);
+		pp += strlen(path)-hostlen;
+		sp = server_url;
+		sp += strlen(server_url)-hostlen;
+		if (strcmp(sp, pp) == 0) {
+			/* make server name appear as directory */
+			DEBUG(1, ("smbfs_stat: showing server as directory\n"));
+			bzero(buf, sizeof(struct stat));
+			buf->st_mode = S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH;
+    		return 0;
+		}
+	}
+	/* check if current_info is in share requested */
+	service = g_new(char, strlen(path)+1);
+	service = g_strdup(path);
+	p = service;
+	if (strcmp(p, URL_HEADER))
+		p += HEADER_LEN;
+	if (*p== '/')
+		p++;
+	pp = strchr(p, '/');
+	if (pp)
+		p = ++pp;	/* advance past server name */
+	pp = strchr(p, '/');
+	if (pp)
+		*pp = 0;	/* cut off everthing after service name */
+	else
+		p = g_strdup(IPC);	/* browsing for services */
+	pp = current_info->dirname;
+	if (*pp == '/');
+		pp++;
+	if (strncmp(p, pp, strlen(p)) != 0) {
+		DEBUG(6, ("desired '%s' is not loaded, we have '%s'\n", p, pp));
+		if (loaddir(me, path) < 0)
+			return -1;
+		DEBUG(6, ("loaded dir: '%s'\n", current_info->dirname));
+	}
+	if (service)
+		g_free(service);
+	/* stat dirs & files under shares now */
+	return get_stat_info(sc, path, buf);
+}
+
+static int
+smbfs_lstat (vfs *me, char *path, struct stat *buf)
+{
+	DEBUG(4, ("smbfs_lstat(path:%s)\n", path));
+	return smbfs_stat(me, path, buf);	/* no symlinks on smb filesystem? */
+}
+
+static int
+smbfs_lseek (void *data, off_t offset, int whence)
+{
+	DEBUG(3, ("smbfs_lseek()\n"));
+	my_errno = EOPNOTSUPP;
+    return -1;
+}
+
+static int
+smbfs_mknod (vfs *me, char *path, int mode, int dev)
+{
+	DEBUG(3, ("smbfs_mknod(path:%s, mode:%d, dev:%d)\n", path, mode, dev));
+	my_errno = EOPNOTSUPP;
+    return -1;
+}
+
+static int
+smbfs_mkdir (vfs *me, char *path, mode_t mode)
+{
+	smbfs_connection *sc;
+	char *remote_file;
+
+	DEBUG(3, ("smbfs_mkdir(path:%s, mode:%d)\n", path, mode));
+	if ((remote_file = smbfs_get_path (&sc, path)) == 0)
+		return -1;
+ 
+	convert_path(&path, FALSE);
+
+	if (!cli_mkdir(sc->cli, path)) {
+		my_errno = cli_error(sc->cli, NULL, &err, NULL);
+        message_3s (1, MSG_ERROR, _(" %s mkdir'ing %s "), 
+			cli_errstr(sc->cli), CNV_LANG(path));
+		return -1;
+	} 
+    return 0;
+}
+
+static int
+smbfs_rmdir (vfs *me, char *path)
+{
+	smbfs_connection *sc;
+	char *remote_file;
+
+	DEBUG(3, ("smbfs_rmdir(path:%s)\n", path));
+	if ((remote_file = smbfs_get_path (&sc, path)) == 0)
+		return -1;
+
+	convert_path(&path, FALSE);
+
+	if (!cli_rmdir(sc->cli, path)) {
+		my_errno = cli_error(sc->cli, NULL, &err, NULL);
+        message_3s (1, MSG_ERROR, _(" %s rmdir'ing %s "), 
+			cli_errstr(sc->cli), CNV_LANG(path));
+		return -1;
+	} 
+    return 0;
+}
+
+static int
+smbfs_link (vfs *me, char *p1, char *p2)
+{
+	DEBUG(3, ("smbfs_link(p1:%s, p2:%s)\n", p1, p2));
+	my_errno = EOPNOTSUPP;
+    return -1;
+}
+
+/* We do not free anything right now: we free resources when we run
+ * out of them
+ */
+static vfsid
+smbfs_getid (vfs *me, char *p, struct vfs_stamping **parent)
+{
+    *parent = NULL;
+	DEBUG(3, ("smbfs_getid(p:%s)\n", p));
+    
+    return (vfsid) -1;
+}
+
+static int
+smbfs_nothingisopen (vfsid id)
+{
+	DEBUG(3, ("smbfs_nothingisopen(%d)\n", (int)id));
+    return 0;
+}
+
+static void
+smbfs_free (vfsid id)
+{
+	DEBUG(3, ("smbfs_free(%d)\n", (int)id));
+    /* FIXME: Should not be empty */
+}
+
+/* Gives up on a socket and reopnes the connection, the child own the socket
+ * now
+ */
+static void
+my_forget (char *path)
+{
+    char *host, *user, *pass, *p;
+    int  port, i;
+
+    if (strncmp (path, URL_HEADER, HEADER_LEN))
+		return;
+
+	DEBUG(3, ("my_forget(path:%s)\n", path));
+    
+    path += 6;
+    if (path[0] == '/' && path[1] == '/')
+	path += 2;
+
+    if ((p = smbfs_get_host_and_username (&path, &host, &user, &port, &pass))
+		== 0) {
+		g_free (host);
+		g_free (user);
+		if (pass)
+		    wipe_password (pass);
+		return;
+    }
+    for (i = 0; i < SMBFS_MAX_CONNECTIONS; i++) {
+		if ((strcmp (host, smbfs_connections [i].host) == 0) &&
+		    (strcmp (user, smbfs_connections [i].user) == 0) &&
+		    (port == smbfs_connections [i].port)) {
+
+		    /* close socket: the child owns it now */
+			cli_shutdown(smbfs_connections [i].cli);
+
+		    /* reopen the connection */
+		    smbfs_connections [i].cli =
+				do_connect(host, smbfs_connections[i].service);
+		}
+    }
+    g_free (p);
+    g_free (host);
+    g_free (user);
+    if (pass)
+		wipe_password (pass);
+}
+
+static int 
+smbfs_setctl (vfs *me, char *path, int ctlop, char *arg)
+{
+	DEBUG(3, ("smbfs_setctl(path:%s, ctlop:%d)\n", path, ctlop));
+    switch (ctlop) {
+        case MCCTL_FORGET_ABOUT:
+	    my_forget(path);
+	    return 0;
+    }
+    return 0;
+}
+
+static smbfs_handle *
+open_write (smbfs_handle *remote_handle, char *rname, int flags, int mode)
+{
+	if (flags & O_TRUNC)	/* if it exists truncate to zero */
+		DEBUG(3, ("open_write: O_TRUNC\n"));
+
+	remote_handle->fnum = cli_open(remote_handle->cli, rname, flags, DENY_NONE);
+
+	if (remote_handle->fnum == -1) {
+        message_3s (1, MSG_ERROR, _(" %s opening remote file %s "), 
+			cli_errstr(remote_handle->cli), CNV_LANG(rname));
+		DEBUG(1,("smbfs_open(rname:%s) error:%s\n",
+			rname, cli_errstr(remote_handle->cli)));
+		my_errno = cli_error(remote_handle->cli, NULL, &err, NULL);
+    	return NULL;
+	}
+	
+    return remote_handle;
+}
+
+static smbfs_handle *
+open_read (smbfs_handle *remote_handle, char *rname, int flags, int mode)
+{
+	size_t		size;
+
+	remote_handle->fnum =
+		cli_open(remote_handle->cli, rname, O_RDONLY, DENY_NONE);
+
+	if (remote_handle->fnum == -1) {
+        message_3s (1, MSG_ERROR, _(" %s opening remote file %s "), 
+			cli_errstr(remote_handle->cli), CNV_LANG(rname));
+		DEBUG(1,("smbfs_open(rname:%s) error:%s\n",
+			rname, cli_errstr(remote_handle->cli)));
+		my_errno = cli_error(remote_handle->cli, NULL, &err, NULL);
+    	return NULL;
+	}
+ 
+    if (!cli_qfileinfo(remote_handle->cli, remote_handle->fnum,
+               &remote_handle->attr, &size, NULL, NULL, NULL, NULL, NULL) &&
+        !cli_getattrE(remote_handle->cli, remote_handle->fnum,
+              &remote_handle->attr, &size, NULL, NULL, NULL)) {
+	    message_2s (1, MSG_ERROR, " getattrib: %s ",
+			cli_errstr(remote_handle->cli));
+		DEBUG(1,("smbfs_open(rname:%s) getattrib:%s\n",
+			rname, cli_errstr(remote_handle->cli)));
+		my_errno = cli_error(remote_handle->cli, NULL, &err, NULL);
+        return NULL;
+    }
+
+    return remote_handle;
+}
+
+static void *
+smbfs_open (vfs *me, char *file, int flags, int mode)
+{
+    char *remote_file;
+	void *ret;
+    smbfs_connection	*sc;
+    smbfs_handle		*remote_handle;
+
+	DEBUG(3, ("smbfs_open(file:%s, flags:%d, mode:%d)\n", file, flags, mode));
+
+    if (!(remote_file = smbfs_get_path (&sc, file)))
+		return 0;
+
+	convert_path(&remote_file, FALSE);
+
+    remote_handle			= g_new (smbfs_handle, 2);
+    remote_handle->cli		= sc->cli;
+	remote_handle->nread	= 0;
+
+	if (flags & O_CREAT)
+		ret = open_write(remote_handle, remote_file, flags, mode);
+	else
+		ret = open_read(remote_handle, remote_file, flags, mode);
+	return ret;
+}
+
+static int
+smbfs_unlink (vfs *me, char *path)
+{
+    smbfs_connection *sc;
+	char *remote_file;
+
+    if ((remote_file = smbfs_get_path (&sc, path)) == 0)
+	    return -1;
+ 
+	convert_path(&remote_file, FALSE);
+
+    if (!cli_unlink(sc->cli, remote_file)) {
+        message_3s (1, MSG_ERROR, _(" %s opening remote file %s "), 
+			cli_errstr(sc->cli), CNV_LANG(remote_file));
+		return -1;
+    }   
+    return 0;
+}
+
+static int
+smbfs_rename (vfs *me, char *a, char *b)
+{
+    smbfs_connection *sc;
+	char *ra, *rb;
+
+    if ((ra = smbfs_get_path (&sc, a)) == 0)
+	    return -1;
+ 
+    if ((rb = smbfs_get_path (&sc, b)) == 0)
+	    return -1;
+ 
+	convert_path(&ra, FALSE);
+	convert_path(&rb, FALSE);
+
+    if (!cli_rename(sc->cli, ra, rb)) {
+        message_2s (1, MSG_ERROR, _(" %s renaming files\n"), 
+			cli_errstr(sc->cli));
+		return -1;
+    }   
+    return 0;
+}
+
+static int
+smbfs_fstat (void *data, struct stat *buf)
+{
+    smbfs_handle *remote_handle = (smbfs_handle *)data;
+
+	DEBUG(3, ("smbfs_fstat(fnum:%d)\n", remote_handle->fnum));
+
+	/* use left over from previous get_remote_stat, if available */
+	if (single_entry)
+		memcpy(buf, &single_entry->my_stat, sizeof(struct stat));
+/*	my_errno = EOPNOTSUPP;
+	return -1;	*/
+	return 0;
+}
+
+vfs vfs_smbfs_ops = {
+    NULL,	/* This is place of next pointer */
+    "netbios over tcp/ip",
+    F_NET,	/* flags */
+    "smb:",	/* prefix */
+    NULL,	/* data */
+    0,		/* errno */
+    smbfs_init,
+    NULL,
+    smbfs_fill_names,
+    NULL,
+
+    smbfs_open,
+    smbfs_close,
+    smbfs_read,
+    smbfs_write,
+    
+    smbfs_opendir,
+    smbfs_readdir,
+    smbfs_closedir,
+    NULL,
+    NULL,
+
+    smbfs_stat,
+    smbfs_lstat,
+    smbfs_fstat,
+
+    smbfs_chmod,
+    smbfs_chown,
+    smbfs_utime,
+
+    smbfs_readlink,
+    smbfs_symlink,
+    smbfs_link,
+    smbfs_unlink,
+
+    smbfs_rename,
+    smbfs_chdir,
+    smbfs_errno,
+    smbfs_lseek,
+    smbfs_mknod,
+    
+    smbfs_getid,
+    smbfs_nothingisopen,
+    smbfs_free,
+    
+    NULL,
+    NULL,
+
+    smbfs_mkdir,
+    smbfs_rmdir,
+    NULL,
+    smbfs_setctl
+
+MMAPNULL
+};
diff -ruN old/mc-4.5.34/vfs/smbfs.h new/mc-4.5.35/vfs/smbfs.h
--- old/mc-4.5.34/vfs/smbfs.h	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.35/vfs/smbfs.h	Mon Jul  5 21:18:55 1999
@@ -0,0 +1 @@
+/* smbfs.h */