diff -ruN old/mc-4.5.11/Makefile.in new/mc-4.5.12/Makefile.in
--- old/mc-4.5.11/Makefile.in	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/Makefile.in	Sun Feb  7 02:53:24 1999
@@ -56,11 +56,11 @@
 	if test x$(DESTDIR) = x; then $(SHELL) $(srcdir)/create_vcs; fi
 
 installdirs:
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(idldir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(idldir)
 
 mcfninstall:
 	-/bin/sh ./mcfn_install
diff -ruN old/mc-4.5.11/README new/mc-4.5.12/README
--- old/mc-4.5.11/README	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/README	Sun Feb  7 02:53:24 1999
@@ -2,7 +2,9 @@
 
 Contents:
 ---------
-  Intro text
+  Requirments
+  GNOME edition requirments
+  Features
   Midnight Commander editions
   Where to get more information
   The Midnight Commander
@@ -10,6 +12,35 @@
   Obtaining the Midnight Commander
   Reporting problems.
 
+This version of the Midnight Commander comes with two interfaces: a
+graphical one for the GNOME desktop (http://www.gnome.org) and a text
+mode interface (the same old user interface we have had for a long
+time). 
+
+Most of the engine is shared between both versions, but they come with
+radically different interfaces:  the GNOME version is aimed to be a
+simple to use tool for novice users.
+
+Requirments
+-----------
+
+To compile the GNU Midnight Commander you need at least to have a copy
+of the glib library, this library is available in ftp://ftp.gtk.org/pub/gtk.
+
+GNOME edition requirements
+--------------------------
+
+Optionally, if you want to compile the GNOME edition, you need to
+install the GNOME libraries and its dependencies.
+
+The GNOME libraries are available in:
+
+    ftp://ftp.gnome.org/pub/GNOME/sources/gnome-libs
+
+
+Features
+--------
+
 This is version 4 of the Midnight Commander, a free Norton Commander
 Clone with many useful features. The Midnight Commander comes with
 mouse support on xterms and optionally on the Linux console.
@@ -83,16 +114,6 @@
 	on the fly, coloring mail messages and more.
 
 
-Midnight Commander editions:
-----------------------------
-
-The Midnight Commander may be compiled into three different editions:
-the text mode edition, the Tk edition and the XView edition.  Please
-note that currently the only supported edition is the text mode
-edition.  The Tk and XView editions are included with the tar file but
-are not finished and thus not supported.
-
-
 Where to get more information:
 ------------------------------
 
@@ -125,6 +146,8 @@
 
 Mini-documentation:
 -------------------
+
+These are hints for the text mode edition:
 
 o Use the F-Keys for invoking the commands in the function key bar.
   If your terminal doesn't support F-keys, you can use the <ESC digit>
diff -ruN old/mc-4.5.11/Specfile new/mc-4.5.12/Specfile
--- old/mc-4.5.11/Specfile	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/Specfile	Sun Feb  7 02:53:24 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      4.5.11
+%define ver      4.5.12
 %define prefix   /usr
 
 Summary:   Midnight Commander visual shell
diff -ruN old/mc-4.5.11/VERSION new/mc-4.5.12/VERSION
--- old/mc-4.5.11/VERSION	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/VERSION	Sun Feb  7 02:53:24 1999
@@ -1 +1 @@
-#define VERSION "4.5.11"
+#define VERSION "4.5.12"
diff -ruN old/mc-4.5.11/aclocal.m4 new/mc-4.5.12/aclocal.m4
--- old/mc-4.5.11/aclocal.m4	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/aclocal.m4	Sun Feb  7 02:53:24 1999
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.3
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
diff -ruN old/mc-4.5.11/configure new/mc-4.5.12/configure
--- old/mc-4.5.11/configure	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/configure	Sun Feb  7 02:53:24 1999
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.12 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -111,7 +111,6 @@
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -395,7 +394,7 @@
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.12"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -565,11 +564,9 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-ac_exeext=
-ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -586,7 +583,7 @@
 
 
 PACKAGE=mc
-VERSION=4.5.11
+VERSION=4.5.12
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -610,7 +607,7 @@
 # Extract the first word of "mc", so it can be a program name with args.
 set dummy mc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:614: checking for $ac_word" >&5
+echo "configure:611: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -618,13 +615,9 @@
   /*)
   ac_cv_path_MC="$MC" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_MC="$MC" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_MC="$ac_dir/$ac_word"
@@ -649,7 +642,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:653: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:646: 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
@@ -678,16 +671,15 @@
 # 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:682: checking for $ac_word" >&5
+echo "configure:675: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -708,17 +700,16 @@
   # 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:712: checking for $ac_word" >&5
+echo "configure:704: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -753,61 +744,25 @@
   echo "$ac_t""no" 1>&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:763: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:752: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext << EOF
-
-#line 806 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 762 "configure"
 #include "confdefs.h"
-
 main(){return(0);}
 EOF
-if { (eval echo configure:811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
@@ -821,24 +776,18 @@
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:786: 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:842: checking whether we are using GNU C" >&5
+echo "configure:791: 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
@@ -847,7 +796,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:851: \"$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:800: \"$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
@@ -858,15 +807,11 @@
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:870: checking whether ${CC-cc} accepts -g" >&5
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:815: 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
@@ -881,24 +826,20 @@
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
     CFLAGS="-O2"
-  else
-    CFLAGS=
   fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:902: checking how to run the C preprocessor" >&5
+echo "configure:843: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -913,14 +854,14 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 917 "configure"
+#line 858 "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:923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
@@ -930,31 +871,14 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 934 "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:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 951 "configure"
+#line 875 "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:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
@@ -967,8 +891,6 @@
 rm -f conftest*
 fi
 rm -f conftest*
-fi
-rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
   CPP="$ac_cv_prog_CPP"
@@ -980,16 +902,15 @@
 # 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:984: checking for $ac_word" >&5
+echo "configure:906: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
@@ -1008,7 +929,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1012: checking whether ln -s works" >&5
+echo "configure:933: 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
@@ -1033,16 +954,15 @@
 # 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:1037: checking for $ac_word" >&5
+echo "configure:958: 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
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_AWK="$ac_prog"
@@ -1079,7 +999,7 @@
 
 
 echo $ac_n "checking whether we are using GNU make""... $ac_c" 1>&6
-echo "configure:1083: checking whether we are using GNU make" >&5
+echo "configure:1003: 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
@@ -1105,9 +1025,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1109: checking for AIX" >&5
+echo "configure:1029: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1111 "configure"
+#line 1031 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1130,18 +1050,18 @@
 
 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1134: checking for minix/config.h" >&5
+echo "configure:1054: 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 1139 "configure"
+#line 1059 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:1064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1178,7 +1098,7 @@
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1182: checking for POSIXized ISC" >&5
+echo "configure:1102: 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
@@ -1199,7 +1119,7 @@
 fi
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1203: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1123: 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
@@ -1209,7 +1129,7 @@
 do
   CFLAGS="$ac_save_CFLAGS $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 1213 "configure"
+#line 1133 "configure"
 #include "confdefs.h"
 #include <signal.h>
 #if !defined(__STDC__) || __STDC__ != 1
@@ -1223,7 +1143,7 @@
 struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:1227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -1243,19 +1163,19 @@
 esac
 
 echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6
-echo "configure:1247: checking whether sys/types.h defines makedev" >&5
+echo "configure:1167: 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 1252 "configure"
+#line 1172 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 return makedev(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_sys_types_h_makedev=yes
 else
@@ -1273,18 +1193,18 @@
 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:1277: checking for sys/mkdev.h" >&5
+echo "configure:1197: 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 1282 "configure"
+#line 1202 "configure"
 #include "confdefs.h"
 #include <sys/mkdev.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1311,18 +1231,18 @@
   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:1315: checking for sys/sysmacros.h" >&5
+echo "configure:1235: 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 1320 "configure"
+#line 1240 "configure"
 #include "confdefs.h"
 #include <sys/sysmacros.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1349,12 +1269,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1353: checking for working const" >&5
+echo "configure:1273: 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 1358 "configure"
+#line 1278 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1403,7 +1323,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1426,7 +1346,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:1430: checking for $ac_word" >&5
+echo "configure:1350: 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
@@ -1434,13 +1354,9 @@
   /*)
   ac_cv_path_MV="$MV" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_MV="$MV" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_MV="$ac_dir/$ac_word"
@@ -1462,7 +1378,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:1466: checking for $ac_word" >&5
+echo "configure:1382: 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
@@ -1470,13 +1386,9 @@
   /*)
   ac_cv_path_CP="$CP" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_CP="$CP" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_CP="$ac_dir/$ac_word"
@@ -1498,7 +1410,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:1502: checking for $ac_word" >&5
+echo "configure:1414: 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
@@ -1506,13 +1418,9 @@
   /*)
   ac_cv_path_RM="$RM" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_RM="$RM" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_RM="$ac_dir/$ac_word"
@@ -1534,7 +1442,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:1538: checking for $ac_word" >&5
+echo "configure:1446: 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
@@ -1542,13 +1450,9 @@
   /*)
   ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_CHMOD="$ac_dir/$ac_word"
@@ -1570,7 +1474,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:1574: checking for $ac_word" >&5
+echo "configure:1478: 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
@@ -1578,13 +1482,9 @@
   /*)
   ac_cv_path_AR="$AR" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_AR="$AR" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_AR="$ac_dir/$ac_word"
@@ -1607,16 +1507,15 @@
 # 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:1611: checking for $ac_word" >&5
+echo "configure:1511: 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
   if test -n "$system"; then
   ac_cv_prog_system="$system" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_system="`uname`"
@@ -1639,16 +1538,15 @@
 # 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:1643: checking for $ac_word" >&5
+echo "configure:1542: 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
   if test -n "$X11_WWW"; then
   ac_cv_prog_X11_WWW="$X11_WWW" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_X11_WWW="$ac_prog"
@@ -1674,12 +1572,12 @@
 
 ALL_LINGUAS="es fr ru ko it de pl no"
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1678: checking for ANSI C header files" >&5
+echo "configure:1576: 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 1683 "configure"
+#line 1581 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1687,8 +1585,8 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
@@ -1704,7 +1602,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 1708 "configure"
+#line 1606 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1722,7 +1620,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 1726 "configure"
+#line 1624 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1743,7 +1641,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1747 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1754,7 +1652,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1778,21 +1676,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1782: checking for inline" >&5
+echo "configure:1680: 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 1789 "configure"
+#line 1687 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1818,12 +1716,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1822: checking for off_t" >&5
+echo "configure:1720: 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 1827 "configure"
+#line 1725 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1832,7 +1730,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_off_t=yes
 else
@@ -1851,12 +1749,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1855: checking for size_t" >&5
+echo "configure:1753: 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 1860 "configure"
+#line 1758 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1865,7 +1763,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_size_t=yes
 else
@@ -1886,19 +1784,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:1890: checking for working alloca.h" >&5
+echo "configure:1788: 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 1895 "configure"
+#line 1793 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1919,30 +1817,25 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1923: checking for alloca" >&5
+echo "configure:1821: 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 1928 "configure"
+#line 1826 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
 # else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
+#  ifdef _AIX
  #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif
@@ -1952,7 +1845,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1977,19 +1870,19 @@
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
+  ALLOCA=alloca.o
   cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1988: checking whether alloca needs Cray hooks" >&5
+echo "configure:1881: 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 1993 "configure"
+#line 1886 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2014,12 +1907,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:2018: checking for $ac_func" >&5
+echo "configure:1911: 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 2023 "configure"
+#line 1916 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2042,7 +1935,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2069,7 +1962,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2073: checking stack direction for C alloca" >&5
+echo "configure:1966: 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
@@ -2077,7 +1970,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2081 "configure"
+#line 1974 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2096,7 +1989,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2121,18 +2014,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2125: checking for $ac_hdr" >&5
+echo "configure:2018: 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 2130 "configure"
+#line 2023 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2160,12 +2053,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2164: checking for $ac_func" >&5
+echo "configure:2057: 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 2169 "configure"
+#line 2062 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2188,7 +2081,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2213,7 +2106,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2217: checking for working mmap" >&5
+echo "configure:2110: 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
@@ -2221,7 +2114,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2225 "configure"
+#line 2118 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2361,7 +2254,7 @@
 }
 
 EOF
-if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2389,18 +2282,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2393: checking for $ac_hdr" >&5
+echo "configure:2286: 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 2398 "configure"
+#line 2291 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:2296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2429,12 +2322,12 @@
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2433: checking for $ac_func" >&5
+echo "configure:2326: 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 2438 "configure"
+#line 2331 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2457,7 +2350,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2486,12 +2379,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2490: checking for $ac_func" >&5
+echo "configure:2383: 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 2495 "configure"
+#line 2388 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2514,7 +2407,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2548,19 +2441,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2552: checking for LC_MESSAGES" >&5
+echo "configure:2445: 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 2557 "configure"
+#line 2450 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2581,7 +2474,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2585: checking whether NLS is requested" >&5
+echo "configure:2478: 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"
@@ -2601,7 +2494,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2605: checking whether included gettext is requested" >&5
+echo "configure:2498: 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"
@@ -2620,18 +2513,18 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2624: checking for libintl.h" >&5
+echo "configure:2517: 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 2629 "configure"
+#line 2522 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -2647,19 +2540,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:2651: checking for gettext in libc" >&5
+echo "configure:2544: 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 2656 "configure"
+#line 2549 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -2675,7 +2568,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2679: checking for bindtextdomain in -lintl" >&5
+echo "configure:2572: 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
@@ -2683,7 +2576,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2687 "configure"
+#line 2580 "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
@@ -2694,7 +2587,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2710,19 +2603,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:2714: checking for gettext in libintl" >&5
+echo "configure:2607: 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 2719 "configure"
+#line 2612 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -2750,7 +2643,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:2754: checking for $ac_word" >&5
+echo "configure:2647: 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
@@ -2784,12 +2677,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2788: checking for $ac_func" >&5
+echo "configure:2681: 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 2793 "configure"
+#line 2686 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2812,7 +2705,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2839,7 +2732,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:2843: checking for $ac_word" >&5
+echo "configure:2736: 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
@@ -2847,13 +2740,9 @@
   /*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
@@ -2875,7 +2764,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:2879: checking for $ac_word" >&5
+echo "configure:2768: 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
@@ -2907,7 +2796,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 2911 "configure"
+#line 2800 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2915,7 +2804,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -2938,7 +2827,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2942: checking whether catgets can be used" >&5
+echo "configure:2831: 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"
@@ -2951,7 +2840,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2955: checking for main in -li" >&5
+echo "configure:2844: 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
@@ -2959,14 +2848,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2963 "configure"
+#line 2852 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2994,12 +2883,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2998: checking for catgets" >&5
+echo "configure:2887: 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 3003 "configure"
+#line 2892 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3022,7 +2911,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3044,7 +2933,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:3048: checking for $ac_word" >&5
+echo "configure:2937: 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
@@ -3052,13 +2941,9 @@
   /*)
   ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GENCAT="$ac_dir/$ac_word"
@@ -3080,7 +2965,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:3084: checking for $ac_word" >&5
+echo "configure:2969: 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
@@ -3088,13 +2973,9 @@
   /*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
@@ -3117,7 +2998,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:3121: checking for $ac_word" >&5
+echo "configure:3002: 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
@@ -3152,7 +3033,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:3156: checking for $ac_word" >&5
+echo "configure:3037: 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
@@ -3210,7 +3091,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:3214: checking for $ac_word" >&5
+echo "configure:3095: 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
@@ -3244,7 +3125,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:3248: checking for $ac_word" >&5
+echo "configure:3129: 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
@@ -3252,13 +3133,9 @@
   /*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
@@ -3280,7 +3157,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:3284: checking for $ac_word" >&5
+echo "configure:3161: 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
@@ -3370,7 +3247,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3374: checking for catalogs to be installed" >&5
+echo "configure:3251: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3398,18 +3275,18 @@
    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:3402: checking for linux/version.h" >&5
+echo "configure:3279: 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 3407 "configure"
+#line 3284 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:3289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3568,7 +3445,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:3572: checking for $ac_word" >&5
+echo "configure:3449: 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
@@ -3576,13 +3453,9 @@
   /*)
   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word"
@@ -3603,7 +3476,7 @@
 
   min_glib_version=0.99.7
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:3607: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:3480: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -3626,7 +3499,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 3630 "configure"
+#line 3503 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -3702,7 +3575,7 @@
 }
 
 EOF
-if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3736,7 +3609,7 @@
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 3740 "configure"
+#line 3613 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -3746,7 +3619,7 @@
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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"
@@ -3778,7 +3651,7 @@
      fi
      GLIB_CFLAGS=""
      GLIB_LIBS=""
-     :
+     { echo "configure: error: Test for GLIB failed.  MC requires GLIB." 1>&2; exit 1; }
   fi
   
   
@@ -3824,30 +3697,28 @@
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3833: checking for a BSD compatible install" >&5
+echo "configure:3705: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
+      for ac_prog in ginstall installbsd scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -3877,26 +3748,24 @@
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 for ac_hdr in unistd.h string.h memory.h crypt.h grp.h limits.h malloc.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3889: checking for $ac_hdr" >&5
+echo "configure:3758: 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 3894 "configure"
+#line 3763 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:3768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3925,18 +3794,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3929: checking for $ac_hdr" >&5
+echo "configure:3798: 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 3934 "configure"
+#line 3803 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:3808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3967,12 +3836,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3971: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3840: 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 3976 "configure"
+#line 3845 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3988,7 +3857,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -4013,12 +3882,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:4017: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3886: 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 4022 "configure"
+#line 3891 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4026,7 +3895,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4051,7 +3920,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:4055: checking for opendir in -ldir" >&5
+echo "configure:3924: 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
@@ -4059,7 +3928,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4063 "configure"
+#line 3932 "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 +3939,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:3943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4092,7 +3961,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4096: checking for opendir in -lx" >&5
+echo "configure:3965: 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
@@ -4100,7 +3969,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4104 "configure"
+#line 3973 "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
@@ -4111,7 +3980,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4135,7 +4004,7 @@
 
 
 echo $ac_n "checking filename fits on dirent.d_name""... $ac_c" 1>&6
-echo "configure:4139: checking filename fits on dirent.d_name" >&5
+echo "configure:4008: 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
@@ -4149,7 +4018,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 4153 "configure"
+#line 4022 "configure"
 #include "confdefs.h"
 
 #include <src/fs.h>
@@ -4166,7 +4035,7 @@
 
 
 EOF
-if { (eval echo configure:4170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_dnamesize="no"
@@ -4195,12 +4064,12 @@
 echo "$ac_t""$ac_cv_dnamesize" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4199: checking for ANSI C header files" >&5
+echo "configure:4068: 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 4204 "configure"
+#line 4073 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4208,8 +4077,8 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:4081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
@@ -4225,7 +4094,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 4229 "configure"
+#line 4098 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4243,7 +4112,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 4247 "configure"
+#line 4116 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4264,7 +4133,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4268 "configure"
+#line 4137 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4275,7 +4144,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4307,12 +4176,12 @@
 
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:4311: checking for st_blksize in struct stat" >&5
+echo "configure:4180: 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 4316 "configure"
+#line 4185 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4320,7 +4189,7 @@
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:4324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -4341,12 +4210,12 @@
 fi
 
 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:4345: checking for st_blocks in struct stat" >&5
+echo "configure:4214: 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 4350 "configure"
+#line 4219 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4354,7 +4223,7 @@
 struct stat s; s.st_blocks;
 ; return 0; }
 EOF
-if { (eval echo configure:4358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blocks=yes
 else
@@ -4373,16 +4242,16 @@
 EOF
 
 else
-  LIBOBJS="$LIBOBJS fileblocks.${ac_objext}"
+  LIBOBJS="$LIBOBJS fileblocks.o"
 fi
 
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:4381: checking for st_rdev in struct stat" >&5
+echo "configure:4250: 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 4386 "configure"
+#line 4255 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4390,7 +4259,7 @@
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:4394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -4415,12 +4284,12 @@
 for ac_func in strerror statfs getwd strcasecmp strncasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4419: checking for $ac_func" >&5
+echo "configure:4288: 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 4424 "configure"
+#line 4293 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4443,7 +4312,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4470,12 +4339,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:4474: checking for $ac_func" >&5
+echo "configure:4343: 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 4479 "configure"
+#line 4348 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4498,7 +4367,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4525,12 +4394,12 @@
 for ac_func in memset memcpy tcsetattr tcgetattr cfgetospeed
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4529: checking for $ac_func" >&5
+echo "configure:4398: 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 4534 "configure"
+#line 4403 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4553,7 +4422,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4580,12 +4449,12 @@
 for ac_func in sigaction sigemptyset sigprocmask sigaddset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4584: checking for $ac_func" >&5
+echo "configure:4453: 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 4589 "configure"
+#line 4458 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4608,7 +4477,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4635,12 +4504,12 @@
 for ac_func in sysconf setuid setreuid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4639: checking for $ac_func" >&5
+echo "configure:4508: 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 4644 "configure"
+#line 4513 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4663,7 +4532,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4691,7 +4560,7 @@
 SHADOWLIB=
 if test x$system = xLinux; then
 echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
-echo "configure:4695: checking for pw_encrypt in -lshadow" >&5
+echo "configure:4564: 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
@@ -4699,7 +4568,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lshadow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4703 "configure"
+#line 4572 "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
@@ -4710,7 +4579,7 @@
 pw_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4731,18 +4600,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4735: checking for $ac_hdr" >&5
+echo "configure:4604: 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 4740 "configure"
+#line 4609 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:4614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -4774,18 +4643,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4778: checking for $ac_hdr" >&5
+echo "configure:4647: 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 4783 "configure"
+#line 4652 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:4657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -4832,7 +4701,7 @@
 NEED_CRYPT_PROTOTYPE=yes
 if test x$ac_cv_header_crypt_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4836 "configure"
+#line 4705 "configure"
 #include "confdefs.h"
 #include <crypt.h>
 int main() { return 0; }
@@ -4853,7 +4722,7 @@
 else 
     if test x$ac_cv_header_unistd_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4857 "configure"
+#line 4726 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -4884,18 +4753,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4888: checking for $ac_hdr" >&5
+echo "configure:4757: 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 4893 "configure"
+#line 4762 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:4767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -4925,12 +4794,12 @@
 for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4929: checking for $ac_func" >&5
+echo "configure:4798: 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 4934 "configure"
+#line 4803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4953,7 +4822,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4975,7 +4844,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:4979: checking for crypt in -lcrypt" >&5
+echo "configure:4848: 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
@@ -4983,7 +4852,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4987 "configure"
+#line 4856 "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
@@ -4994,7 +4863,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5014,7 +4883,7 @@
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for crypt in -lcrypt_i""... $ac_c" 1>&6
-echo "configure:5018: checking for crypt in -lcrypt_i" >&5
+echo "configure:4887: 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
@@ -5022,7 +4891,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt_i  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5026 "configure"
+#line 4895 "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
@@ -5033,7 +4902,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:5037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5063,12 +4932,12 @@
 for ac_func in grantpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5067: checking for $ac_func" >&5
+echo "configure:4936: 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 5072 "configure"
+#line 4941 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5091,7 +4960,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5119,7 +4988,7 @@
     :
 else
     echo $ac_n "checking for grantpt in -lpt""... $ac_c" 1>&6
-echo "configure:5123: checking for grantpt in -lpt" >&5
+echo "configure:4992: 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
@@ -5127,7 +4996,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5131 "configure"
+#line 5000 "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
@@ -5138,7 +5007,7 @@
 grantpt()
 ; return 0; }
 EOF
-if { (eval echo configure:5142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5169,7 +5038,7 @@
 
 if test x$GCC = xyes; then
     echo $ac_n "checking for tolower in -lintl""... $ac_c" 1>&6
-echo "configure:5173: checking for tolower in -lintl" >&5
+echo "configure:5042: 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
@@ -5177,7 +5046,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5181 "configure"
+#line 5050 "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
@@ -5188,7 +5057,7 @@
 tolower()
 ; return 0; }
 EOF
-if { (eval echo configure:5192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5220,12 +5089,12 @@
 for ac_func in statlstat
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5224: checking for $ac_func" >&5
+echo "configure:5093: 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 5229 "configure"
+#line 5098 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5248,7 +5117,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5274,9 +5143,9 @@
 
 
 echo $ac_n "checking for AIX defines""... $ac_c" 1>&6
-echo "configure:5278: checking for AIX defines" >&5
+echo "configure:5147: checking for AIX defines" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5280 "configure"
+#line 5149 "configure"
 #include "confdefs.h"
 #if defined(AIX) || defined(_AIX) || defined(__aix__) || defined(aix)
 yes
@@ -5301,7 +5170,7 @@
 
 
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5305: checking for getmntent in -lgen" >&5
+echo "configure:5174: 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
@@ -5309,7 +5178,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5313 "configure"
+#line 5182 "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
@@ -5320,7 +5189,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5346,18 +5215,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5350: checking for $ac_hdr" >&5
+echo "configure:5219: 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 5355 "configure"
+#line 5224 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -5386,18 +5255,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5390: checking for $ac_hdr" >&5
+echo "configure:5259: 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 5395 "configure"
+#line 5264 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -5426,18 +5295,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5430: checking for $ac_hdr" >&5
+echo "configure:5299: 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 5435 "configure"
+#line 5304 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -5465,12 +5334,12 @@
     for ac_func in getmntinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5469: checking for $ac_func" >&5
+echo "configure:5338: 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 5474 "configure"
+#line 5343 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5493,7 +5362,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5520,12 +5389,12 @@
 
         
     echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6
-echo "configure:5524: checking for d_ino member in directory struct" >&5
+echo "configure:5393: 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 5529 "configure"
+#line 5398 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5548,7 +5417,7 @@
 struct dirent dp; dp.d_ino = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   fu_cv_sys_d_ino_in_dirent=yes
 else
@@ -5575,7 +5444,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:5579: checking for getmntent in -lsun" >&5
+echo "configure:5448: 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
@@ -5583,7 +5452,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5587 "configure"
+#line 5456 "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
@@ -5594,7 +5463,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5613,7 +5482,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
-echo "configure:5617: checking for getmntent in -lseq" >&5
+echo "configure:5486: 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
@@ -5621,7 +5490,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5625 "configure"
+#line 5494 "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
@@ -5632,7 +5501,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5651,7 +5520,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5655: checking for getmntent in -lgen" >&5
+echo "configure:5524: 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
@@ -5659,7 +5528,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5663 "configure"
+#line 5532 "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
@@ -5670,7 +5539,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5695,12 +5564,12 @@
 fi
 
 echo $ac_n "checking for getmntent""... $ac_c" 1>&6
-echo "configure:5699: checking for getmntent" >&5
+echo "configure:5568: 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 5704 "configure"
+#line 5573 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getmntent(); below.  */
@@ -5723,7 +5592,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getmntent=yes"
 else
@@ -5754,12 +5623,12 @@
       if test -z "$list_mounted_fs"; then
 	# SVR4
 	echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6
-echo "configure:5758: checking for two-argument getmntent function" >&5
+echo "configure:5627: 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 5763 "configure"
+#line 5632 "configure"
 #include "confdefs.h"
 #include <sys/mnttab.h>
 EOF
@@ -5788,7 +5657,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:5792: checking for one-argument getmntent function" >&5
+echo "configure:5661: 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
@@ -5817,12 +5686,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:5821: checking for getfsstat function" >&5
+echo "configure:5690: 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 5826 "configure"
+#line 5695 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5833,7 +5702,7 @@
       numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); 
 ; return 0; }
 EOF
-if { (eval echo configure:5837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   fu_cv_sys_mounted_getsstat=yes
 else
@@ -5858,18 +5727,18 @@
     if test -z "$list_mounted_fs"; then
       # AIX.
       echo $ac_n "checking for mntctl function and struct vmount""... $ac_c" 1>&6
-echo "configure:5862: checking for mntctl function and struct vmount" >&5
+echo "configure:5731: 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 5867 "configure"
+#line 5736 "configure"
 #include "confdefs.h"
 #include <fshelp.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   fu_cv_sys_mounted_vmount=yes
@@ -5896,12 +5765,12 @@
     if test -z "$list_mounted_fs"; then
       # SVR3
       echo $ac_n "checking for existence of three headers""... $ac_c" 1>&6
-echo "configure:5900: checking for existence of three headers" >&5
+echo "configure:5769: 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 5905 "configure"
+#line 5774 "configure"
 #include "confdefs.h"
 
 #include <sys/statfs.h>
@@ -5909,8 +5778,8 @@
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   fu_cv_sys_mounted_fread_fstyp=yes
@@ -5937,7 +5806,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:5941: checking for getmntinfo function" >&5
+echo "configure:5810: 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
@@ -5945,7 +5814,7 @@
 	  ok=
 	  if test $ac_cv_func_getmntinfo = yes; then
 	    cat > conftest.$ac_ext <<EOF
-#line 5949 "configure"
+#line 5818 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 EOF
@@ -5978,20 +5847,20 @@
     if test -z "$list_mounted_fs"; then
       # Ultrix
       echo $ac_n "checking for getmnt function""... $ac_c" 1>&6
-echo "configure:5982: checking for getmnt function" >&5
+echo "configure:5851: 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 5987 "configure"
+#line 5856 "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:5994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   fu_cv_sys_mounted_getmnt=yes
@@ -6018,18 +5887,18 @@
     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:6022: checking whether it is possible to resort to fread on /etc/mnttab" >&5
+echo "configure:5891: 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 6027 "configure"
+#line 5896 "configure"
 #include "confdefs.h"
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   fu_cv_sys_mounted_fread=yes
@@ -6062,7 +5931,7 @@
 
 
     echo "checking how to get filesystem space usage" 1>&6
-echo "configure:6066: checking how to get filesystem space usage" >&5
+echo "configure:5935: checking how to get filesystem space usage" >&5
     space=no
 
     # Here we'll compromise a little (and perform only the link test)
@@ -6072,12 +5941,12 @@
       for ac_func in statvfs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6076: checking for $ac_func" >&5
+echo "configure:5945: 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 6081 "configure"
+#line 5950 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6100,7 +5969,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6136,7 +6005,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:6140: checking for 3-argument statfs function (DEC OSF/1)" >&5
+echo "configure:6009: 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
@@ -6144,7 +6013,7 @@
   fu_cv_sys_stat_statfs3_osf1=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6148 "configure"
+#line 6017 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -6157,7 +6026,7 @@
 	exit (statfs (".", &fsd, sizeof (struct statfs)));
       }
 EOF
-if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs3_osf1=yes
 else
@@ -6184,7 +6053,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:6188: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+echo "configure:6057: 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
@@ -6192,7 +6061,7 @@
   fu_cv_sys_stat_statfs2_bsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6196 "configure"
+#line 6065 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_PARAM_H
@@ -6211,7 +6080,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_bsize=yes
 else
@@ -6238,7 +6107,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:6242: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+echo "configure:6111: 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
@@ -6246,7 +6115,7 @@
   fu_cv_sys_stat_statfs4=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6250 "configure"
+#line 6119 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statfs.h>
@@ -6256,7 +6125,7 @@
       exit (statfs (".", &fsd, sizeof fsd, 0));
       }
 EOF
-if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs4=yes
 else
@@ -6283,7 +6152,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:6287: checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)" >&5
+echo "configure:6156: 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
@@ -6291,7 +6160,7 @@
   fu_cv_sys_stat_statfs2_fsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6295 "configure"
+#line 6164 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -6307,7 +6176,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_fsize=yes
 else
@@ -6334,7 +6203,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:6338: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+echo "configure:6207: 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
@@ -6342,7 +6211,7 @@
   fu_cv_sys_stat_fs_data=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6346 "configure"
+#line 6215 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6363,7 +6232,7 @@
       exit (statfs (".", &fsd) != 1);
       }
 EOF
-if { (eval echo configure:6367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_fs_data=yes
 else
@@ -6391,12 +6260,12 @@
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6395: checking for mode_t" >&5
+echo "configure:6264: 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 6400 "configure"
+#line 6269 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6405,7 +6274,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_mode_t=yes
 else
@@ -6424,12 +6293,12 @@
 fi
 
 echo $ac_n "checking for umode_t""... $ac_c" 1>&6
-echo "configure:6428: checking for umode_t" >&5
+echo "configure:6297: 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 6433 "configure"
+#line 6302 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6438,7 +6307,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])umode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "umode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_umode_t=yes
 else
@@ -6457,12 +6326,12 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6461: checking for off_t" >&5
+echo "configure:6330: 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 6466 "configure"
+#line 6335 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6471,7 +6340,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_off_t=yes
 else
@@ -6490,12 +6359,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6494: checking for pid_t" >&5
+echo "configure:6363: 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 6499 "configure"
+#line 6368 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6504,7 +6373,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_pid_t=yes
 else
@@ -6523,12 +6392,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6527: checking for uid_t in sys/types.h" >&5
+echo "configure:6396: 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 6532 "configure"
+#line 6401 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -6557,12 +6426,12 @@
 fi
 
 echo $ac_n "checking for nlink_t""... $ac_c" 1>&6
-echo "configure:6561: checking for nlink_t" >&5
+echo "configure:6430: 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 6566 "configure"
+#line 6435 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6571,7 +6440,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])nlink_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "nlink_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_nlink_t=yes
 else
@@ -6594,18 +6463,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6598: checking for $ac_hdr" >&5
+echo "configure:6467: 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 6603 "configure"
+#line 6472 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6633,12 +6502,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6637: checking for $ac_func" >&5
+echo "configure:6506: 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 6642 "configure"
+#line 6511 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6661,7 +6530,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6686,7 +6555,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6690: checking for working mmap" >&5
+echo "configure:6559: 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
@@ -6694,7 +6563,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6698 "configure"
+#line 6567 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6834,7 +6703,7 @@
 }
 
 EOF
-if { (eval echo configure:6838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6859,19 +6728,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:6863: checking for working alloca.h" >&5
+echo "configure:6732: 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 6868 "configure"
+#line 6737 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -6892,30 +6761,25 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6896: checking for alloca" >&5
+echo "configure:6765: 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 6901 "configure"
+#line 6770 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
 # else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
+#  ifdef _AIX
  #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif
@@ -6925,7 +6789,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -6950,19 +6814,19 @@
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
+  ALLOCA=alloca.o
   cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6961: checking whether alloca needs Cray hooks" >&5
+echo "configure:6825: 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 6966 "configure"
+#line 6830 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6987,12 +6851,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:6991: checking for $ac_func" >&5
+echo "configure:6855: 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 6996 "configure"
+#line 6860 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7015,7 +6879,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7042,7 +6906,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7046: checking stack direction for C alloca" >&5
+echo "configure:6910: 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
@@ -7050,7 +6914,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 7054 "configure"
+#line 6918 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7069,7 +6933,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -7097,7 +6961,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:7101: checking for X" >&5
+echo "configure:6965: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -7159,13 +7023,13 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 7163 "configure"
+#line 7027 "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:7168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:7032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   # We can compile using X headers with no special include directory.
@@ -7233,14 +7097,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7237 "configure"
+#line 7101 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:7244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -7346,17 +7210,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:7350: checking whether -R must be followed by a space" >&5
+echo "configure:7214: 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 7353 "configure"
+#line 7217 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -7372,14 +7236,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 7376 "configure"
+#line 7240 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -7411,7 +7275,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:7415: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7279: 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
@@ -7419,7 +7283,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7423 "configure"
+#line 7287 "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
@@ -7430,7 +7294,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7452,7 +7316,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:7456: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7320: 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
@@ -7460,7 +7324,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7464 "configure"
+#line 7328 "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
@@ -7471,7 +7335,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7500,12 +7364,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:7504: checking for gethostbyname" >&5
+echo "configure:7368: 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 7509 "configure"
+#line 7373 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -7528,7 +7392,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -7549,7 +7413,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7553: checking for gethostbyname in -lnsl" >&5
+echo "configure:7417: 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
@@ -7557,7 +7421,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7561 "configure"
+#line 7425 "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
@@ -7568,7 +7432,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7598,12 +7462,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:7602: checking for connect" >&5
+echo "configure:7466: 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 7607 "configure"
+#line 7471 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -7626,7 +7490,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -7647,7 +7511,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7651: checking for connect in -lsocket" >&5
+echo "configure:7515: 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
@@ -7655,7 +7519,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7659 "configure"
+#line 7523 "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
@@ -7666,7 +7530,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:7670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7690,12 +7554,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:7694: checking for remove" >&5
+echo "configure:7558: 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 7699 "configure"
+#line 7563 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -7718,7 +7582,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -7739,7 +7603,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7743: checking for remove in -lposix" >&5
+echo "configure:7607: 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
@@ -7747,7 +7611,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7751 "configure"
+#line 7615 "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
@@ -7758,7 +7622,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:7762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7782,12 +7646,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7786: checking for shmat" >&5
+echo "configure:7650: 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 7791 "configure"
+#line 7655 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -7810,7 +7674,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -7831,7 +7695,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7835: checking for shmat in -lipc" >&5
+echo "configure:7699: 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
@@ -7839,7 +7703,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7843 "configure"
+#line 7707 "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
@@ -7850,7 +7714,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:7854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7883,15 +7747,15 @@
   # 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:7887: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7751: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7895 "configure"
+#line 7759 "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
@@ -7902,7 +7766,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7929,7 +7793,7 @@
 
 
 echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:7933: checking for t_accept in -lnsl" >&5
+echo "configure:7797: 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
@@ -7937,7 +7801,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7941 "configure"
+#line 7805 "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
@@ -7948,7 +7812,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:7952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7976,7 +7840,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:7980: checking for socket in -lsocket" >&5
+echo "configure:7844: 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
@@ -7984,7 +7848,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7988 "configure"
+#line 7852 "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
@@ -7995,7 +7859,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8027,12 +7891,12 @@
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8031: checking for $ac_func" >&5
+echo "configure:7895: 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 8036 "configure"
+#line 7900 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8055,7 +7919,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8083,7 +7947,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:8087: checking for socket in -l$lib" >&5
+echo "configure:7951: 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
@@ -8091,7 +7955,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8095 "configure"
+#line 7959 "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
@@ -8102,7 +7966,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8134,12 +7998,12 @@
 
 have_gethostbyname=no
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8138: checking for gethostbyname" >&5
+echo "configure:8002: 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 8143 "configure"
+#line 8007 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8162,7 +8026,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8185,7 +8049,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:8189: checking for gethostbyname in -l$lib" >&5
+echo "configure:8053: 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
@@ -8193,7 +8057,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8197 "configure"
+#line 8061 "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
@@ -8204,7 +8068,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8230,12 +8094,12 @@
 for ac_func in socketpair
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8234: checking for $ac_func" >&5
+echo "configure:8098: 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 8239 "configure"
+#line 8103 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8258,7 +8122,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8284,7 +8148,7 @@
 
 
 echo $ac_n "checking for get_process_stats in -lseq""... $ac_c" 1>&6
-echo "configure:8288: checking for get_process_stats in -lseq" >&5
+echo "configure:8152: 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
@@ -8292,7 +8156,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8296 "configure"
+#line 8160 "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
@@ -8303,7 +8167,7 @@
 get_process_stats()
 ; return 0; }
 EOF
-if { (eval echo configure:8307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8331,7 +8195,7 @@
 
 
     echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:8335: checking for t_accept in -lnsl" >&5
+echo "configure:8199: 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
@@ -8339,7 +8203,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8343 "configure"
+#line 8207 "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
@@ -8350,7 +8214,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:8354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8378,7 +8242,7 @@
 fi
 
   echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8382: checking for socket in -lsocket" >&5
+echo "configure:8246: 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
@@ -8386,7 +8250,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8390 "configure"
+#line 8254 "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
@@ -8397,7 +8261,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8429,12 +8293,12 @@
   for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8433: checking for $ac_func" >&5
+echo "configure:8297: 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 8438 "configure"
+#line 8302 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8457,7 +8321,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8485,7 +8349,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:8489: checking for socket in -l$lib" >&5
+echo "configure:8353: 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
@@ -8493,7 +8357,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8497 "configure"
+#line 8361 "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
@@ -8504,7 +8368,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8536,12 +8400,12 @@
 
   have_gethostbyname=no
   echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8540: checking for gethostbyname" >&5
+echo "configure:8404: 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 8545 "configure"
+#line 8409 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8564,7 +8428,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8587,7 +8451,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:8591: checking for gethostbyname in -l$lib" >&5
+echo "configure:8455: 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
@@ -8595,7 +8459,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8599 "configure"
+#line 8463 "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
@@ -8606,7 +8470,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8636,14 +8500,14 @@
       
 av_struct_linger=no
 echo $ac_n "checking struct linger is available""... $ac_c" 1>&6
-echo "configure:8640: checking struct linger is available" >&5
+echo "configure:8504: checking struct linger is available" >&5
 if test "$cross_compiling" = yes; then
   
 av_struct_linger=no
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8647 "configure"
+#line 8511 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8659,7 +8523,7 @@
 }
 
 EOF
-if { (eval echo configure:8663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   
 cat >> confdefs.h <<\EOF
@@ -8684,12 +8548,12 @@
       for ac_func in pmap_set
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8688: checking for $ac_func" >&5
+echo "configure:8552: 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 8693 "configure"
+#line 8557 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8712,7 +8576,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8734,7 +8598,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pmap_set in -lrpc""... $ac_c" 1>&6
-echo "configure:8738: checking for pmap_set in -lrpc" >&5
+echo "configure:8602: 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
@@ -8742,7 +8606,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrpc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8746 "configure"
+#line 8610 "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
@@ -8753,7 +8617,7 @@
 pmap_set()
 ; return 0; }
 EOF
-if { (eval echo configure:8757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8785,12 +8649,12 @@
       for ac_func in pmap_getport pmap_getmaps rresvport
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8789: checking for $ac_func" >&5
+echo "configure:8653: 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 8794 "configure"
+#line 8658 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8813,7 +8677,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8841,18 +8705,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8845: checking for $ac_hdr" >&5
+echo "configure:8709: 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 8850 "configure"
+#line 8714 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:8719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -9070,7 +8934,7 @@
 else
   
 	echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6
-echo "configure:9074: checking for Gpm_Repeat in -lgpm" >&5
+echo "configure:8938: 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
@@ -9078,7 +8942,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9082 "configure"
+#line 8946 "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
@@ -9089,7 +8953,7 @@
 Gpm_Repeat()
 ; return 0; }
 EOF
-if { (eval echo configure:9093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9228,7 +9092,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:9232: checking for $ac_word" >&5
+echo "configure:9096: 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
@@ -9236,13 +9100,9 @@
   /*)
   ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word"
@@ -9265,7 +9125,7 @@
 	      no_gnome_config="yes"
 	    else
 	      echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
-echo "configure:9269: checking if $GNOME_CONFIG works" >&5
+echo "configure:9129: checking if $GNOME_CONFIG works" >&5
 	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
 	        echo "$ac_t""yes" 1>&6
 	        
@@ -9273,7 +9133,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:9277: checking for $ac_word" >&5
+echo "configure:9137: 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
@@ -9281,13 +9141,9 @@
   /*)
   ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_ORBIT_CONFIG="$ac_dir/$ac_word"
@@ -9309,7 +9165,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:9313: checking for $ac_word" >&5
+echo "configure:9169: 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
@@ -9317,13 +9173,9 @@
   /*)
   ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a path.
   ;;
-  ?:/*)			 
-  ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a dos path.
-  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_ORBIT_IDL="$ac_dir/$ac_word"
@@ -9343,7 +9195,7 @@
 fi
 
 	echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6
-echo "configure:9347: checking for working ORBit environment" >&5
+echo "configure:9199: 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
@@ -9379,7 +9231,7 @@
 	fi
 
 	echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6
-echo "configure:9383: checking for gnorba libraries" >&5
+echo "configure:9235: 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
@@ -9453,7 +9305,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:9457: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo "configure:9309: 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" \
@@ -9487,16 +9339,15 @@
 # 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:9491: checking for $ac_word" >&5
+echo "configure:9343: 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
   if test -n "$HAVE_nroff"; then
   ac_cv_prog_HAVE_nroff="$HAVE_nroff" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_HAVE_nroff="true"
@@ -9516,7 +9367,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6
-echo "configure:9520: checking for manual formatting macros" >&5
+echo "configure:9371: 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
@@ -9540,7 +9391,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6
-echo "configure:9544: checking If nroff accepts -Tascii" >&5
+echo "configure:9395: 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
@@ -9564,16 +9415,15 @@
 # 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:9568: checking for $ac_word" >&5
+echo "configure:9419: 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
   if test -n "$HAVE_FILECMD"; then
   ac_cv_prog_HAVE_FILECMD="$HAVE_FILECMD" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_HAVE_FILECMD="true"
@@ -9593,7 +9443,7 @@
 
 if $HAVE_FILECMD; then
     echo $ac_n "checking for - option to file command""... $ac_c" 1>&6
-echo "configure:9597: checking for - option to file command" >&5
+echo "configure:9447: 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
@@ -9636,7 +9486,7 @@
 
             
 echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6
-echo "configure:9640: checking for -L option to file command" >&5
+echo "configure:9490: 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
@@ -9662,7 +9512,7 @@
 fi 
 
 echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6
-echo "configure:9666: checking for - option to grep command" >&5
+echo "configure:9516: 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
@@ -9702,7 +9552,7 @@
 
 
 echo $ac_n "checking for subshell support""... $ac_c" 1>&6
-echo "configure:9706: checking for subshell support" >&5
+echo "configure:9556: checking for subshell support" >&5
 # Check whether --with-subshell or --without-subshell was given.
 if test "${with_subshell+set}" = set; then
   withval="$with_subshell"
@@ -9844,7 +9694,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:9848: checking for SLang_init_tty in -lslang" >&5
+echo "configure:9698: 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
@@ -9852,7 +9702,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9856 "configure"
+#line 9706 "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
@@ -9863,7 +9713,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:9867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9882,18 +9732,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9886: checking for $ac_hdr" >&5
+echo "configure:9736: 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 9891 "configure"
+#line 9741 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -9927,18 +9777,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9931: checking for $ac_hdr" >&5
+echo "configure:9781: 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 9936 "configure"
+#line 9786 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10007,7 +9857,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10011: checking for tgoto in -ltermcap" >&5
+echo "configure:9861: 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
@@ -10015,7 +9865,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10019 "configure"
+#line 9869 "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
@@ -10026,7 +9876,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10137,7 +9987,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10141: checking for tgoto in -ltermcap" >&5
+echo "configure:9991: 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
@@ -10145,7 +9995,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10149 "configure"
+#line 9999 "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
@@ -10156,7 +10006,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10331,18 +10181,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10335: checking for $ac_hdr" >&5
+echo "configure:10185: 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 10340 "configure"
+#line 10190 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10394,7 +10244,7 @@
 	fi
 else
   	echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6
-echo "configure:10398: checking for ext2fs_close in -lext2fs" >&5
+echo "configure:10248: 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
@@ -10402,7 +10252,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lext2fs -lcom_err $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10406 "configure"
+#line 10256 "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
@@ -10413,7 +10263,7 @@
 ext2fs_close()
 ; return 0; }
 EOF
-if { (eval echo configure:10417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10434,18 +10284,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10438: checking for $ac_hdr" >&5
+echo "configure:10288: 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 10443 "configure"
+#line 10293 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10509,7 +10359,7 @@
 if $search_ncurses
 then
     echo "checking "location of ncurses.h file"" 1>&6
-echo "configure:10513: checking "location of ncurses.h file"" >&5
+echo "configure:10363: checking "location of ncurses.h file"" >&5
 
     
     if $search_ncurses
@@ -10649,7 +10499,7 @@
                 if $search_ncurses 
     then
         cat > conftest.$ac_ext <<EOF
-#line 10653 "configure"
+#line 10503 "configure"
 #include "confdefs.h"
 #include </usr/include/curses.h>
 EOF
@@ -10675,7 +10525,7 @@
 rm -f conftest*
 
 	cat > conftest.$ac_ext <<EOF
-#line 10679 "configure"
+#line 10529 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -10735,10 +10585,10 @@
     else
         # check for ncurses version, to properly ifdef mouse-fix
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10739: checking for ncurses version" >&5
+echo "configure:10589: checking for ncurses version" >&5
 	ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 10742 "configure"
+#line 10592 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>
@@ -10782,12 +10632,12 @@
 for ac_func in resizeterm keyok
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10786: checking for $ac_func" >&5
+echo "configure:10636: 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 10791 "configure"
+#line 10641 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10810,7 +10660,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10898,7 +10748,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10902: checking for tgoto in -ltermcap" >&5
+echo "configure:10752: 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
@@ -10906,7 +10756,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10910 "configure"
+#line 10760 "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
@@ -10917,7 +10767,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10957,7 +10807,7 @@
     install_saver="yes"
 
                 echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:10961: checking for pam_start in -lpam" >&5
+echo "configure:10811: 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
@@ -10965,7 +10815,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpam -ldl $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10969 "configure"
+#line 10819 "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
@@ -10976,7 +10826,7 @@
 pam_start()
 ; return 0; }
 EOF
-if { (eval echo configure:10980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11019,7 +10869,7 @@
 else
     
 echo $ac_n "checking for -lXpm""... $ac_c" 1>&6
-echo "configure:11023: checking for -lXpm" >&5
+echo "configure:10873: checking for -lXpm" >&5
 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11035,7 +10885,7 @@
 	has_xpm_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 11039 "configure"
+#line 10889 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11045,7 +10895,7 @@
 XpmLibraryVersion();
 ; return 0; }
 EOF
-if { (eval echo configure:11049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_has_xpm=yes
 else
@@ -11067,7 +10917,7 @@
 	
 	
 echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6
-echo "configure:11071: checking for X11 non-rectangular shape extension" >&5
+echo "configure:10921: 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
@@ -11083,7 +10933,7 @@
 	has_shape_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 11087 "configure"
+#line 10937 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11098,7 +10948,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_has_shape=yes
 else
@@ -11134,7 +10984,7 @@
 			echo
 		else
 		echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6
-echo "configure:11138: checking for setupterm in -lcurses" >&5
+echo "configure:10988: 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
@@ -11142,7 +10992,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11146 "configure"
+#line 10996 "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
@@ -11153,7 +11003,7 @@
 setupterm()
 ; return 0; }
 EOF
-if { (eval echo configure:11157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11170,7 +11020,7 @@
   echo "$ac_t""yes" 1>&6
   
 			cat > conftest.$ac_ext <<EOF
-#line 11174 "configure"
+#line 11024 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -11183,7 +11033,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			LIBS="$LIBS -lcurses"
@@ -11273,7 +11123,7 @@
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  case `(ac_space=' '; set) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -11340,7 +11190,7 @@
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -11387,11 +11237,9 @@
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
-s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -11455,7 +11303,6 @@
 s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
 s%@GLIB_LIBS@%$GLIB_LIBS%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@REGEX_O@%$REGEX_O%g
 s%@LIBOBJS@%$LIBOBJS%g
diff -ruN old/mc-4.5.11/configure.in new/mc-4.5.12/configure.in
--- old/mc-4.5.11/configure.in	Thu Feb  4 21:34:08 1999
+++ new/mc-4.5.12/configure.in	Sun Feb  7 02:53:24 1999
@@ -5,7 +5,7 @@
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.11
+VERSION=4.5.12
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
@@ -122,7 +122,7 @@
 dnl
 dnl We now use glib
 dnl 
-AM_PATH_GLIB
+AM_PATH_GLIB(,,AC_MSG_ERROR(Test for GLIB failed.  MC requires GLIB.))
 LIBS="$LIBS $GLIB_LIBS"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 
diff -ruN old/mc-4.5.11/gnome/ChangeLog new/mc-4.5.12/gnome/ChangeLog
--- old/mc-4.5.11/gnome/ChangeLog	Thu Feb  4 21:34:14 1999
+++ new/mc-4.5.12/gnome/ChangeLog	Sun Feb  7 02:53:31 1999
@@ -1,3 +1,109 @@
+1999-02-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtkdtree.c (gtk_dtree_select_row): Disable row selection when
+	were are removing entries from the tree.
+
+	* gutil.c (my_system_get_child_pid): Fix.  We always wait for the
+	child process.
+
+	* gtkdtree.c (gtk_dtree_lookup_dir): Scan the whole tree.
+	Appanrently now the nodes expose are not ordered, but can contain
+	holes and gaps
+
+1999-02-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gtkdtree.c (gtk_dtree_insert_node): This function was never
+	returning the newly-created sibling.
+
+Sun Feb  7 05:29:17 1999  Timur Bakeyev <mc@bat.ru>
+
+	* Makefile.in: Remove references and dependences to/from libslang -
+	we don't need this in GNOME. Changed the order of linking - libgtkedit
+	require libgnomeui.a, so swap $(LDFLAGS) and $(EXTRALIBS). The same for
+	corba edition.
+	
+	gdnd.c, gmetadata.c, gpopup2.c, gtools.c: Adde #include "global.h" or
+	move it before #include <gnome.h> to avoid warnings about redefining
+	MIN, MAX nad RE_DUP_MAX. More clean compiling.
+	
+	* gpopup2.h: New file - to avoid errors during "make distcheck". What
+	it is for, really?
+
+1999-02-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gnome-file-property-dialog.c (apply_metadata_change): #include
+	string.h and replace references to rindex to strrchr.
+
+1999-02-07  Tomas Ogren  <stric@ing.umu.se>
+
+	* glayout.c, gnome-file-property-dialog.c: s/rindex/strrchr/
+	To get rid of BSDism and make it compile on solaris 2.6
+
+1999-02-06  Ettore Perazzoli  <ettore@comm2000.it>
+
+	* gscreen.c (x_create_panel): The location bar is now a simple
+ 	GtkHBox instead of a GtkToolbar, and as a consequence the location
+ 	entry widget is expanded to fill all of the window horizontally.
+
+1999-02-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdesktop.c (drag_data_get): Set the Netscape URL from the icon
+	if it is available.  Wheee!  We can now drop icons onto Netscape.
+
+	* gmain.h: Added prototype for gmc_open_filename().
+
+	* gdesktop.c (desktop_icon_info_open): Fixed call to
+	gmc_open_filename().  See why it is good to have prototypes? :-)
+
+	* gdnd.c (perform_action): Oops.  Removed a leftover "break" that
+	was causing the loop to exit, so you could not operate on more
+	than one file.
+
+1999-02-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gpopup2.c (popup_handle_properties): Update the URL information
+	on change.
+
+	* gnome-file-property-dialog.c (generate_actions_box): Fix memory leak.
+	(create_general_properties): Fix memory leak.
+
+	* gdesktop.c (desktop_icon_update_url): New function.  Updates any
+	changes done to the url/caption on the file-property-dialog.
+
+	* gnome-file-property-dialog.c
+	(gnome_file_property_dialog_finalize): Release all of the
+	resources allocated (metadata routines alwayre return an allocated
+	block of memory).
+
+	Add support for changing the url an icon points to and the caption.
+
+	* gdnd.c (drop_url_on_directory): Better set the icon-filename
+	metadata entry instead of hard coding it.
+
+1999-02-05  Jonathan Blandford  <jrb@redhat.com>
+
+	* gcmd.c (gnome_reverse_selection_cmd_panel): new function -- does
+	good things
+
+	* gscreen.c (panel_icon_list_select_icon): uses new popup menu
+	(panel_icon_list_button_press): ditto
+
+	* gpopup2.c (gpopup_do_popup2): new implementation of popup
+	menu.  Many changes -- almost all internal.  Much cleaner now...
+	Off to England.
+
+1999-02-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gicon.c (gicon_get_url_image): Return an image for url types.
+	(gicon_init): Load the url image.
+
+	* gdesktop.c (desktop_icon_info_new): Use an URL image for
+	desktop-urls.   Use the url as the caption for those icons. 
+	
+1999-02-04  Jonathan Blandford  <jrb@redhat.com>
+
+	* gprefs.c (caching_and_optimization_props): wording changes
+
 1999-02-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gdesktop.c (desktop_icon_info_open): Run "execute" if the file
diff -ruN old/mc-4.5.11/gnome/Makefile.in new/mc-4.5.12/gnome/Makefile.in
--- old/mc-4.5.11/gnome/Makefile.in	Thu Feb  4 21:34:14 1999
+++ new/mc-4.5.12/gnome/Makefile.in	Sun Feb  7 02:53:31 1999
@@ -6,12 +6,12 @@
 
 GNOMEDEFS     = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@ 
 CFLAGS        = -g $(XCFLAGS) @X_CFLAGS@ -I. -I$(rootdir)/src
-CPPFLAGS      = $(XCPPFLAGS) -I$(vfsdir) -I$(slangdir) $(GNOMEDEFS)
+CPPFLAGS      = $(XCPPFLAGS) -I$(vfsdir) $(GNOMEDEFS)
 LDFLAGS       = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@
 DEFS = $(XDEFS)
 LIBS = $(XLIBS) @TERMNET@ 
-EXTRALIBS = @LVFS@ -lgtkedit @LINTL@
+EXTRALIBS = -L../vfs @LVFS@ -L../gtkedit -lgtkedit @LINTL@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -48,6 +48,7 @@
 	gmetadata.c	\
 	gpageprop.c	\
 	gpopup.c	\
+	gpopup2.c	\
 	gprefs.c	\
 	gprop.c		\
 	gnome-file-property-dialog.c \
@@ -74,6 +75,7 @@
 	gmetadata.h	\
 	gpageprop.h	\
 	gpopup.h	\
+	gpopup2.h	\
 	gprefs.h	\
 	gprop.h		\
 	gnome-file-property-dialog.h \
@@ -140,6 +142,7 @@
 	gmetadata.o	\
 	gpageprop.o	\
 	gpopup.o	\
+	gpopup2.o	\
 	gprefs.o	\
 	gprop.o		\
 	gnome-file-property-dialog.o \
@@ -172,11 +175,13 @@
 
 EXTRA_DIST = gnome.TODO layout gmc.gnorba mc.keys.in.in	gimp.image.desktop 
 
+DISTGNOME_NEW = \
+	gimp.image.desktop application.x-gnumeric.desktop
+
 DISTGNOME = \
 	Makefile.in ChangeLog $(EXTRA_DIST) $(CORBA_SOURCES) \
 	$(PIXMAPS) $(ICONS) $(GNOMESRCS) $(GNOMEHDRS) $(DISTGNOME_NEW)
-DISTGNOME_NEW = \
-	gimp.image.desktop application.x-gnumeric.desktop
+
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
 
@@ -199,11 +204,11 @@
 	@echo -----------------------------------------------------------
 	@touch mx
 
-plain-gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) @LIBSLANG@ libgtkedit.a
-	$(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(LDFLAGS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
+plain-gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) libgtkedit.a
+	$(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) 
 
-corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) @LIBSLANG@ libgtkedit.a
-	$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(CORBA_LDFLAGS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
+corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) libgtkedit.a
+	$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS) 
 
 mc.keys: mc.keys.in Makefile
 	sed -e 's^\@icondir\@^$(icondir)^g' < mc.keys.in > mc.keys.tmp \
@@ -217,11 +222,6 @@
 @PCENTRULE@	-$(RMF) @LIBVFS@
 @PCENTRULE@	$(LN_S) ../vfs/@LIBVFS@ .
 
-libmcslang.a:
-	cd ../slang; $(MAKE) libmcslang.a
-@PCENTRULE@	-$(RMF) libmcslang.a
-@PCENTRULE@	$(LN_S) ../slang/libmcslang.a .
-
 libgtkedit.a:
 	cd ../gtkedit; $(MAKE) libgtkedit.a
 @PCENTRULE@	-$(RMF) libgtkedit.a
@@ -250,7 +250,7 @@
 	etags $(GNOMESRCS)
 
 clean:
-	$(RMF) plain-gmc corba-gmc *.o core a.out mx @LIBVFS@ libgtkedit.a libmcslang.a
+	$(RMF) plain-gmc corba-gmc *.o core a.out mx @LIBVFS@ libgtkedit.a
 
 realclean: clean
 	$(RMF) .depend
@@ -271,19 +271,18 @@
 install_:
 
 install_mx: all 
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(icondir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(libdir)
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir)
-	$(mcsrcdir)/xmkdir $(gnewdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(icondir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mime-info
+	$(MKINSTALLDIRS) $(DESTDIR)$(corbadir)
+	$(MKINSTALLDIRS) $(gnewdir)
 	$(INSTALL_PROGRAM) plain-gmc $(DESTDIR)$(bindir)/$(binprefix)plain-gmc
 	$(INSTALL_PROGRAM) corba-gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
 	for I in $(ICONS); \
 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
 	$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)/layout
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(datadir)/mime-info
 	$(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(corbadir)
 	$(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir)
 
 uninstall: 
diff -ruN old/mc-4.5.11/gnome/gcmd.c new/mc-4.5.12/gnome/gcmd.c
--- old/mc-4.5.11/gnome/gcmd.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gcmd.c	Sun Feb  7 02:53:33 1999
@@ -539,13 +539,30 @@
 {
 	gint i;
 	for (i = 0; i < panel->count; i++){
-		if (!strcmp (panel->dir.list [i].fname, ".."))
+		if (!strcmp (panel->dir.list [i].fname, "..")) {
 			continue;
+		}
 		do_file_mark (panel, i, 1);
 	}
 	paint_panel (panel);
 	do_refresh ();
 }
+void
+gnome_reverse_selection_cmd_panel (WPanel *panel)
+{
+    file_entry *file;
+    int i;
+
+    for (i = 0; i < panel->count; i++){
+	    if (!strcmp (panel->dir.list [i].fname, "..")) {
+		    continue;
+	    }
+	    file = &panel->dir.list [i];
+	    do_file_mark (panel, i, !file->f.marked);
+    }
+    paint_panel (panel);
+}
+
 void
 gnome_filter_cmd (GtkWidget *widget, WPanel *panel)
 {
diff -ruN old/mc-4.5.11/gnome/gcmd.h new/mc-4.5.12/gnome/gcmd.h
--- old/mc-4.5.11/gnome/gcmd.h	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gcmd.h	Sun Feb  7 02:53:34 1999
@@ -19,5 +19,6 @@
 void gnome_open_files        (GtkWidget *widget, WPanel *panel);
 void gnome_run_new           (GtkWidget *widget, GnomeDesktopEntry *gde);
 void gnome_mkdir_cmd         (GtkWidget *widget, WPanel *panel);
+void gnome_reverse_selection_cmd_panel (WPanel *panel);
 
 #endif /* __GCMD_H */
diff -ruN old/mc-4.5.11/gnome/gdesktop.c new/mc-4.5.12/gnome/gdesktop.c
--- old/mc-4.5.11/gnome/gdesktop.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gdesktop.c	Sun Feb  7 02:53:33 1999
@@ -123,7 +123,9 @@
 
 
 static DesktopIconInfo *desktop_icon_info_new (char *filename, char *url,
-					       int user_pos, int auto_pos, int xpos, int ypos);
+					       char *caption,
+					       int user_pos, int auto_pos,
+					       int xpos, int ypos);
 
 
 /* Looks for a free slot in the layout_slots array and returns the coordinates that coorespond to
@@ -321,6 +323,7 @@
 typedef struct {
 	char *filename;
 	char *url;
+	char *caption;
 } file_and_url_t;
 
 /*
@@ -339,7 +342,7 @@
 	DesktopIconInfo *dii;
 	GSList *need_position_list, *sl;
 	GList *all_icons, *l;
-	char *desktop_url;
+	char *desktop_url, *caption;
 
 	dir = mc_opendir (desktop_directory);
 	if (!dir) {
@@ -394,26 +397,34 @@
 		full_name = g_concat_dir_and_file (desktop_directory, dirent->d_name);
 		have_pos = gmeta_get_icon_pos (full_name, &x, &y);
 
-		if (!gnome_metadata_get (full_name, "desktop-url", &size, &desktop_url))
+		if (gnome_metadata_get (full_name, "desktop-url", &size, &desktop_url) != 0)
 			desktop_url = NULL;
 
+		caption = NULL;
+		gnome_metadata_get (full_name, "icon-caption", &size, &caption);
+		
 		if (have_pos) {
-			dii = desktop_icon_info_new (dirent->d_name, desktop_url, FALSE, FALSE, x, y);
+			dii = desktop_icon_info_new (dirent->d_name, desktop_url, caption, FALSE, FALSE, x, y);
 			gtk_widget_show (dii->dicon);
 
 			g_free (full_name);
 		} else {
 			file_and_url_t *fau;
 
-			fau = g_new (file_and_url_t, 1);
+			fau = g_new0 (file_and_url_t, 1);
 			fau->filename = g_strdup (dirent->d_name);
-			fau->url = g_strdup (desktop_url);
-
+			if (desktop_url)
+				fau->url      = g_strdup (desktop_url);
+			if (caption)
+				fau->caption  = g_strdup (caption);
 			need_position_list = g_slist_prepend (need_position_list, fau);
 		}
 
 		if (desktop_url)
 			g_free (desktop_url);
+
+		if (caption)
+			g_free (caption);
 	}
 
 	mc_closedir (dir);
@@ -444,10 +455,13 @@
 	for (sl = need_position_list; sl; sl = sl->next) {
 		file_and_url_t *fau = sl->data;
 
-		dii = desktop_icon_info_new (fau->filename, fau->url, user_pos, TRUE, xpos, ypos);
+		dii = desktop_icon_info_new (fau->filename, fau->url, fau->caption, user_pos, TRUE, xpos, ypos);
 		gtk_widget_show (dii->dicon);
 
-		g_free (fau->url);
+		if (fau->url)
+			g_free (fau->url);
+		if (fau->caption)
+			g_free (fau->caption);
 		g_free (fau->filename);
 		g_free (fau);
 	}
@@ -683,7 +697,7 @@
 	
 	fullname = g_concat_dir_and_file (desktop_directory, dii->filename);
 	new_text = gnome_icon_text_item_get_text (iti);
-	gnome_metadata_set (fullname, "desktop-url", strlen (new_text) + 1, new_text);
+	gnome_metadata_set (fullname, "icon-caption", strlen (new_text) + 1, new_text);
 
 	return TRUE;
 }
@@ -803,7 +817,7 @@
 		if (is_exe (fe->buf.st_mode) && if_link_is_exe (fe))
 			my_system (EXECUTE_AS_SHELL, shell, filename);
 		else
-			gmc_open_filename (filename);
+			gmc_open_filename (filename, NULL);
 	}
 
 	file_entry_free (fe);
@@ -1136,16 +1150,25 @@
 					len);
 		break;
 
-        case TARGET_URL:
-		files = gnome_uri_list_extract_uris (filelist);
-		if (files) {
+	case TARGET_URL:
+		if (dii->url)
 			gtk_selection_data_set (selection_data,
 						selection_data->target,
 						8,
-						files->data,
-						strlen (files->data));
+						dii->url,
+						strlen (dii->url));
+		else {
+			files = gnome_uri_list_extract_uris (filelist);
+			if (files)
+				gtk_selection_data_set (selection_data,
+							selection_data->target,
+							8,
+							files->data,
+							strlen (files->data));
+
+			gnome_uri_list_free_strings (files);
 		}
-		gnome_uri_list_free_strings (files);
+
 		break;
 
 	default:
@@ -1338,28 +1361,37 @@
  * desktop directory.  It does not show the icon.
  */
 static DesktopIconInfo *
-desktop_icon_info_new (char *filename, char *url, int user_pos, int auto_pos, int xpos, int ypos)
+desktop_icon_info_new (char *filename, char *url, char *caption, int user_pos, int auto_pos, int xpos, int ypos)
 {
 	DesktopIconInfo *dii;
 	file_entry *fe;
 	char *full_name;
 	GdkImlibImage *icon_im;
 	GtkSignalFunc text_changed_func;
-
+	
 	/* Create the icon structure */
 
 	full_name = g_concat_dir_and_file (desktop_directory, filename);
 	fe = file_entry_from_file (full_name);
-	icon_im = gicon_get_icon_for_file_speed (desktop_directory, fe, FALSE);
 
 	dii = g_new (DesktopIconInfo, 1);
-	dii->dicon = desktop_icon_new (icon_im, filename);
 	dii->x = 0;
 	dii->y = 0;
 	dii->slot = -1;
+
+	if (url) {
+		dii->url = g_strdup (url);
+		if (!caption)
+			caption = url;
+	} else {
+		dii->url = NULL;
+		caption = filename;
+	}
+	
+	icon_im = gicon_get_icon_for_file_speed (desktop_directory, fe, FALSE);
+	dii->dicon = desktop_icon_new (icon_im, caption);
 	dii->filename = g_strdup (filename);
 	dii->selected = FALSE;
-	dii->url = g_strdup (url);
 	
 	file_entry_free (fe);
 	g_free (full_name);
@@ -1420,6 +1452,37 @@
 }
 
 /**
+ * desktop_icon_update_url:
+ * @dii: the desktop icon
+ *
+ * Loads from the metadata updated versions of the caption
+ * and the url
+ */
+void
+desktop_icon_update_url (DesktopIconInfo *dii)
+{
+	char *fullname = g_concat_dir_and_file (desktop_directory, dii->filename);
+	char *caption = NULL;
+	char *url = NULL;
+	int size;
+	
+	gnome_metadata_get (fullname, "icon-caption", &size, &caption);
+	if (caption){
+		desktop_icon_set_text (DESKTOP_ICON (dii->dicon), caption);
+		g_free (caption);
+	}
+
+	gnome_metadata_get (fullname, "desktop-url", &size, &url);
+	if (url){
+		if (dii->url)
+			g_free (dii->url);
+		dii->url = url;
+	}
+	
+	g_free (fullname);
+}
+
+/**
  * desktop_icon_info_destroy:
  * @dii: The desktop icon to destroy
  *
@@ -2230,3 +2293,4 @@
 	gtk_widget_destroy (proxy_invisible);
 	XDeleteProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (), gdk_atom_intern ("XdndProxy", FALSE));
 }
+
diff -ruN old/mc-4.5.11/gnome/gdnd.c new/mc-4.5.12/gnome/gdnd.c
--- old/mc-4.5.11/gnome/gdnd.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gdnd.c	Sun Feb  7 02:53:33 1999
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include "global.h"
 #include "file.h"
 #include "fileopctx.h"
 #include "main.h"
@@ -219,7 +220,6 @@
 		} while (result != 0);
 
 		g_free (dest_name);
-		break;
 	}
 
 	file_op_context_destroy (ctx);
@@ -268,12 +268,19 @@
 
 		f = fopen (template, "w");
 		if (f) {
+			char *icon;
+			
 			fprintf (f, "URL: %s\n", selection_data->data);
 			fclose (f);
 
 			gnome_metadata_set (template, "desktop-url",
 					    strlen (selection_data->data) + 1,
 					    selection_data->data);
+
+			icon = g_concat_dir_and_file (ICONDIR, "gnome-http-url.png");
+			gnome_metadata_set (template, "icon-filename",
+					    strlen (icon) + 1, icon);
+			g_free (icon);
 		}
 	}
 
diff -ruN old/mc-4.5.11/gnome/glayout.c new/mc-4.5.12/gnome/glayout.c
--- old/mc-4.5.11/gnome/glayout.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/glayout.c	Sun Feb  7 02:53:33 1999
@@ -492,7 +492,7 @@
 			
 			gde = gnome_desktop_entry_load (file2);
 
-			test = rindex(dirstruc->d_name, '.');
+			test = strrchr(dirstruc->d_name, '.');
 
 			if (test == NULL || gde == NULL || strcmp (test, ".desktop")){
 				g_free (file2);
diff -ruN old/mc-4.5.11/gnome/gmain.h new/mc-4.5.12/gnome/gmain.h
--- old/mc-4.5.11/gnome/gmain.h	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gmain.h	Sun Feb  7 02:53:34 1999
@@ -37,6 +37,7 @@
 void layout_panel_gone (WPanel *panel);
 void gtkrundlg_event (Dlg_head *h);
 int gmc_open (file_entry *fe);
+int gmc_open_filename (char *fname, GList *args);
 int gmc_view (char *filename, int start_line);
 void x_show_info (WInfo *info, struct my_statfs *s, struct stat *b);
 void x_create_info (Dlg_head *h, widget_data parent, WInfo *info);
diff -ruN old/mc-4.5.11/gnome/gmetadata.c new/mc-4.5.12/gnome/gmetadata.c
--- old/mc-4.5.11/gnome/gmetadata.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gmetadata.c	Sun Feb  7 02:53:34 1999
@@ -6,8 +6,8 @@
  */
 
 #include <config.h>
-#include <libgnome/libgnome.h>
 #include "global.h"
+#include <libgnome/libgnome.h>
 #include "gmetadata.h"
 #include <sys/stat.h>
 #include "../vfs/vfs.h"
diff -ruN old/mc-4.5.11/gnome/gnome-file-property-dialog.c new/mc-4.5.12/gnome/gnome-file-property-dialog.c
--- old/mc-4.5.11/gnome/gnome-file-property-dialog.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gnome-file-property-dialog.c	Sun Feb  7 02:53:34 1999
@@ -19,6 +19,7 @@
 
 #include <gnome.h>
 #include <time.h>
+#include <string.h>
 #include "gnome-file-property-dialog.h"
 #include "dir.h"
 #include "gdesktop.h"
@@ -31,6 +32,7 @@
 #include "../vfs/vfs.h"
 #include "gicon.h"
 #include "dialog.h"
+#include "util.h"
 
 static void gnome_file_property_dialog_init		(GnomeFilePropertyDialog	 *file_property_dialog);
 static void gnome_file_property_dialog_class_init	(GnomeFilePropertyDialogClass	 *klass);
@@ -110,6 +112,21 @@
 		g_free (gfpd->file_name);
 	if (gfpd->im)
 		gdk_imlib_destroy_image (gfpd->im);
+	if (gfpd->fm_open)
+		g_free (gfpd->fm_open);
+	if (gfpd->fm_view)
+		g_free (gfpd->fm_view);
+	if (gfpd->edit)
+		g_free (gfpd->edit);
+	if (gfpd->drop_target)
+		g_free (gfpd->drop_target);
+	if (gfpd->icon_filename)
+		g_free (gfpd->icon_filename);
+	if (gfpd->desktop_url)
+		g_free (gfpd->desktop_url);
+	if (gfpd->caption)
+		g_free (gfpd->caption);
+	
 	(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
@@ -140,6 +157,7 @@
 	strrchr (direc, '/')[0] = '\0';
 	fe = file_entry_from_file (fp_dlg->file_name);
 	fp_dlg->im = gicon_get_icon_for_file_speed (direc, fe, FALSE);
+	file_entry_free (fe);
 	g_free (direc);
 	icon = gnome_pixmap_new_from_imlib (fp_dlg->im);
 	gtk_box_pack_start (GTK_BOX (vbox), icon, FALSE, FALSE, 0);
@@ -156,7 +174,7 @@
 	label = gtk_label_new (_("File Name"));
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	fp_dlg->file_entry = gtk_entry_new ();
-	gen_string = rindex (fp_dlg->file_name, '/');
+	gen_string = strrchr (fp_dlg->file_name, '/');
 	if (gen_string)
 		gtk_entry_set_text (GTK_ENTRY (fp_dlg->file_entry), gen_string + 1);
 	else
@@ -270,7 +288,30 @@
 	return vbox;
 }
 
+static GtkWidget *
+create_url_properties (GnomeFilePropertyDialog *fp_dlg)
+{
+	GtkWidget *table, *label;
+
+	table = gtk_table_new (0, 0, 0);
 
+	label = gtk_label_new (_("URL:"));
+	gtk_table_attach (GTK_TABLE (table), label,
+			  1, 2, 1, 2, 0, 0, GNOME_PAD, GNOME_PAD);
+	fp_dlg->desktop_entry = gtk_entry_new ();
+	gtk_table_attach (GTK_TABLE (table), fp_dlg->desktop_entry,
+			  2, 3, 1, 2, GTK_FILL | GTK_EXPAND, 0, GNOME_PAD, GNOME_PAD);
+
+	label = gtk_label_new (_("Caption:"));
+	gtk_table_attach (GTK_TABLE (table), label,
+			  1, 2, 2, 3, 0, 0, GNOME_PAD, GNOME_PAD);
+	fp_dlg->caption_entry = gtk_entry_new ();
+	gtk_table_attach (GTK_TABLE (table), fp_dlg->caption_entry,
+			  2, 3, 2, 3, GTK_FILL | GTK_EXPAND, 0, GNOME_PAD, GNOME_PAD);
+	
+	gtk_widget_show_all (table);
+	return table;
+}
 
 /* Settings Pane */
 static void
@@ -329,6 +370,13 @@
 	if (NULL == fp_dlg->prop1_label)
 		return;
 	fp_dlg->changing = TRUE;
+
+	if (fp_dlg->desktop_url){
+		gtk_entry_set_text (GTK_ENTRY (fp_dlg->desktop_entry), fp_dlg->desktop_url);
+
+		gtk_entry_set_text (GTK_ENTRY (fp_dlg->caption_entry), fp_dlg->caption);
+	}
+
 	if (fp_dlg->executable) {
 		gtk_label_set_text (GTK_LABEL (fp_dlg->prop1_label), "Drop Action");
 		gtk_label_set_text (GTK_LABEL (GTK_BIN (fp_dlg->prop1_cbox)->child), "Use default Drop Action options");
@@ -383,10 +431,15 @@
 	
 	retval = gnome_icon_entry_new ("gmc_file_icon", "Select an Icon");
 	icon = gicon_image_to_name (fp_dlg->im);
-	if (!icon || !icon[0])
+	if (!icon)
 		return retval;
-	g_print ("icon:%s:\n",icon);
+	
+	if (!icon[0]){
+		g_free (icon);
+		return retval;
+	}
 	gnome_icon_entry_set_icon (GNOME_ICON_ENTRY (retval), icon);
+	g_free (icon);
 	return retval;
 }
 static GtkWidget *
@@ -761,7 +814,7 @@
 		if (grp->gr_name)
 			fp_dlg->group_name = g_strdup (grp->gr_name);
 		else {
-			g_snprintf (grpnum, 9, "%d", grp->gr_gid);
+			g_snprintf (grpnum, 9, "%d", (int) grp->gr_gid);
 			fp_dlg->group_name = g_strdup (grpnum);
 		}
 
@@ -771,7 +824,7 @@
 			if (grp->gr_name)
 				grpname = grp->gr_name;
 			else {
-				g_snprintf (grpnum, 9, "%d", grp->gr_gid);
+				g_snprintf (grpnum, 9, "%d", (int) grp->gr_gid);
 				grpname = grpnum;
 			}
 		}
@@ -884,10 +937,10 @@
 init_metadata (GnomeFilePropertyDialog *fp_dlg)
 {
 	gint size;
-	gchar *mime_type;
+	char *mime_type;
 	gchar link_name[60];
 	gint n;
-	gchar *file_name;
+	gchar *file_name, *desktop_url;
 
 	if (gnome_metadata_get (fp_dlg->file_name, "fm-open", &size, &fp_dlg->fm_open) != 0)
 		gnome_metadata_get (fp_dlg->file_name, "open", &size, &fp_dlg->fm_open);
@@ -906,7 +959,18 @@
 		}
 	}
 	
-	mime_type = gnome_mime_type_or_default (file_name, NULL);
+	if (gnome_metadata_get (fp_dlg->file_name, "desktop-url", &size, &desktop_url) == 0)
+		fp_dlg->desktop_url = desktop_url;
+	else
+		fp_dlg->desktop_url = NULL;
+
+	if (gnome_metadata_get (fp_dlg->file_name, "icon-caption", &size, &fp_dlg->caption))
+		fp_dlg->caption = g_strdup (desktop_url);
+			
+	/*
+	 * Mime type.
+	 */
+	mime_type = (char *) gnome_mime_type_or_default (file_name, NULL);
 	if (!mime_type)
 		return;
 	fp_dlg->mime_fm_open = gnome_mime_get_value (mime_type, "fm-open");
@@ -921,6 +985,7 @@
 	gnome_metadata_get (fp_dlg->file_name, "icon-filename", &size, &fp_dlg->icon_filename);
 	if (fp_dlg->icon_filename)
 		g_print ("we have an icon-filename:%s:\n", fp_dlg->icon_filename);
+
 }
 GtkWidget *
 gnome_file_property_dialog_new (gchar *file_name, gboolean can_set_icon)
@@ -957,9 +1022,15 @@
 
 	/* and now, we set up the gui. */
 	notebook = gtk_notebook_new ();
+
+	if (fp_dlg->desktop_url)
+		gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+					  create_url_properties (fp_dlg),
+					  gtk_label_new (_("URL")));
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 				  create_general_properties (fp_dlg),
 				  gtk_label_new (_("Statistics")));
+	
 	new_page = create_settings_pane (fp_dlg);
 	if (new_page)
 		gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
@@ -970,9 +1041,10 @@
 				  gtk_label_new (_("Permissions")));
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (fp_dlg)->vbox),
 			    notebook, TRUE, TRUE, 0);
-	title_string = g_strconcat (rindex (file_name, '/') + 1, _(" Properties"), NULL);
+	title_string = g_strconcat (strrchr (file_name, '/') + 1, _(" Properties"), NULL);
 	gtk_window_set_title (GTK_WINDOW (fp_dlg), title_string);
 	g_free (title_string);
+	
 	gnome_dialog_append_button ( GNOME_DIALOG(fp_dlg), 
 				     GNOME_STOCK_BUTTON_OK);
 	gnome_dialog_append_button ( GNOME_DIALOG(fp_dlg), 
@@ -1053,9 +1125,9 @@
 static gint
 apply_name_change (GnomeFilePropertyDialog *fpd)
 {
-	gchar *new_name;
-	gchar *base_name;
-	gchar *full_target;
+	char *new_name;
+	char *base_name;
+	char *full_target;
 	FileOpContext *ctx;
 	long   count = 0;
 	double bytes = 0;
@@ -1066,14 +1138,21 @@
 		return 0;
 	}
 	/* has it changed? */
-	if (strcmp (rindex(fpd->file_name, '/') + 1, new_name)) {
+	if (strcmp (strrchr(fpd->file_name, '/') + 1, new_name)) {
 		if (strchr (new_name, '/')) {
 			message (1, "Error", _("You cannot rename a file to something containing a '/' character"));
 			return 0;
 		} else {
+			char *p;
+			
 			/* create the files. */
 			base_name = g_strdup (fpd->file_name);
-			rindex (base_name, '/')[0] = '\0';
+			
+			p = strrchr (base_name, '/');
+
+			if (p)
+				*p = '\0';
+			
 			full_target = concat_dir_and_file (base_name, new_name);
 
 			ctx = file_op_context_new ();
@@ -1159,6 +1238,17 @@
 			}
 		}
 	}
+
+	if (fpd->desktop_url){
+		char *new_desktop_url = gtk_entry_get_text (GTK_ENTRY (fpd->desktop_entry));
+		char *new_caption     = gtk_entry_get_text (GTK_ENTRY (fpd->caption_entry));
+
+		gnome_metadata_set (fpd->file_name, "desktop-url",
+				    strlen (new_desktop_url)+1, new_desktop_url);
+		gnome_metadata_set (fpd->file_name, "icon-caption",
+				    strlen (new_caption)+1, new_caption);
+	}
+		
 	if (!fpd->can_set_icon)
 		return 1;
 	/* And finally, we set the metadata on the icon filename */
@@ -1170,8 +1260,14 @@
 			 * default to the basic icon.  We prolly should check that this is a valid
 			 * file here, but I'm too tired to do it now -- jrb */
 			gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text);
-		else
-			gnome_metadata_remove (fpd->file_name, "icon-filename");
+		else {
+			/* If text is equal to icon_name it means the user did not
+			 * touch it, not that he did remove it
+			 */
+			/*
+			  gnome_metadata_remove (fpd->file_name, "icon-filename");
+			*/
+		}
 	}
 	/* I suppose we should only do this if we know there's been a change -- I'll try to figure it
 	 * out later if it turns out to be important. */
diff -ruN old/mc-4.5.11/gnome/gnome-file-property-dialog.h new/mc-4.5.12/gnome/gnome-file-property-dialog.h
--- old/mc-4.5.11/gnome/gnome-file-property-dialog.h	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gnome-file-property-dialog.h	Sun Feb  7 02:53:35 1999
@@ -68,7 +68,9 @@
 	GtkWidget *prop1_label, *prop1_entry, *prop1_cbox;
 	GtkWidget *prop2_label, *prop2_entry, *prop2_cbox, *prop2_hline;
 	GtkWidget *button;
-
+	GtkWidget *desktop_entry;
+	GtkWidget *caption_entry;
+	
 	gchar *fm_open;
 	gchar *fm_view;
 	gchar *drop_target;
@@ -78,6 +80,9 @@
 	gchar *mime_drop_target;
 	gchar *mime_edit;
 	gchar *icon_filename;
+	gchar *desktop_url;
+	gchar *caption;
+	
 	gboolean can_set_icon;
 	GdkImlibImage *im;
 
diff -ruN old/mc-4.5.11/gnome/gpopup.c new/mc-4.5.12/gnome/gpopup.c
--- old/mc-4.5.11/gnome/gpopup.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gpopup.c	Sun Feb  7 02:53:34 1999
@@ -8,8 +8,8 @@
 
 
 #include <config.h>
-#include <gnome.h>
 #include "global.h"
+#include <gnome.h>
 #include "panel.h"
 #include "cmd.h"
 #include "dialog.h"
@@ -94,6 +94,13 @@
 	gtk_widget_show_all (dlg);
 	if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0)
 		retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg));
+
+	/*
+	 * Apply: desktop icon name change and url change
+	 */
+	if (dii->url)
+		desktop_icon_update_url (dii);
+	
 	gtk_widget_destroy (dlg);
 	g_free(path);
 	if (retval)
@@ -529,7 +536,6 @@
 
 	/* Connect to the deactivation signal to be able to quit our
            modal main loop */
-
 	id = gtk_signal_connect (GTK_OBJECT (menu), "deactivate",
 				 (GtkSignalFunc) menu_shell_deactivated,
 				 NULL);
diff -ruN old/mc-4.5.11/gnome/gpopup.h new/mc-4.5.12/gnome/gpopup.h
--- old/mc-4.5.11/gnome/gpopup.h	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gpopup.h	Sun Feb  7 02:53:35 1999
@@ -13,6 +13,9 @@
 #include <gdk/gdktypes.h>
 #include "panel.h"
 #include "gdesktop.h"
+int gpopup_do_popup2 (GdkEventButton *event,
+		      WPanel *panel, GList *file_list,
+		      gboolean on_selected);
 
 int gpopup_do_popup (GdkEventButton *event, WPanel *from_panel,
 		     DesktopIconInfo *dii,
diff -ruN old/mc-4.5.11/gnome/gpopup2.c new/mc-4.5.12/gnome/gpopup2.c
--- old/mc-4.5.11/gnome/gpopup2.c	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.12/gnome/gpopup2.c	Sun Feb  7 02:53:34 1999
@@ -0,0 +1,460 @@
+/* Popup menus for the Midnight Commander
+ *
+ * Copyright (C) 1998 The Free Software Foundation
+ *
+ * Authors: Federico Mena <federico@nuclecu.unam.mx>
+ *          Miguel de Icaza <miguel@nuclecu.unam.mx>
+ * 	    Jonathan Blandford <jrb@redhat.com>
+ */
+
+/* These rules really need to be duplicated elsewhere.
+ * They should exist for the menu bar too...
+ */
+
+#include <config.h>
+#include "global.h"
+#include <gnome.h>
+#include "panel.h"
+#include "cmd.h"
+#include "dialog.h"
+#include "ext.h"
+#include "main.h"
+#include "../vfs/vfs.h"
+#include "gpageprop.h"
+#include "gpopup.h"
+#include "gnome-file-property-dialog.h"
+#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child)
+
+/* Flags for the popup menu entries.  They specify to which kinds of files an entry is valid for. */
+enum {
+	F_ALL 		= 1 << 0,	/* Applies to all files */
+	F_REGULAR	= 1 << 1,	/* Applies only to regular files */
+	F_SYMLINK	= 1 << 2,	/* Applies only to symlink */
+	F_SINGLE	= 1 << 3,	/* Applies only to a single file, not to a multiple selection */
+	F_NOTDIR	= 1 << 4,	/* Applies to non-directories */
+	F_DICON		= 1 << 5,	/* Applies only to desktop icons */
+	F_NOTDEV        = 1 << 6,	/* Applies to non-devices only (ie. reg, lnk, dir) */
+	F_ADVANCED      = 1 << 7        /* Only appears in (non-existent) Advanced mode */
+};
+
+/* typedefs */
+typedef struct action {
+	char *text;		/* Menu item text */
+	int flags;		/* Flags from the above enum */
+	GtkSignalFunc callback;	/* Callback for menu item */
+} action;
+
+/* Prototypes */
+/* Multiple File commands */
+static void panel_action_open_with (GtkWidget *widget, WPanel *panel);
+static void popup_handle_open (GtkWidget *widget, WPanel *panel);
+static void popup_handle_view (GtkWidget *widget, WPanel *panel);
+static void popup_handle_view_unfiltered (GtkWidget *widget, WPanel *panel);
+static void popup_handle_edit (GtkWidget *widget, WPanel *panel);
+static void popup_handle_copy (GtkWidget *widget, WPanel *panel);
+static void popup_handle_delete (GtkWidget *widget, WPanel *panel);
+static void popup_handle_move (GtkWidget *widget, WPanel *panel);
+
+/* F_SINGLE file commands */
+static void popup_handle_properties (GtkWidget *widget, WPanel *panel);
+static void popup_handle_open_with (GtkWidget *widget, WPanel *panel);
+static void popup_handle_hard_link (GtkWidget *widget, WPanel *panel);
+static void popup_handle_symlink (GtkWidget *widget, WPanel *panel);
+static void popup_handle_edit_symlink (GtkWidget *widget, WPanel *panel);
+
+/* Generic Options */
+static void popup_handle_display_properties (GtkWidget *widget, WPanel *panel);
+static void popup_handle_refresh (GtkWidget *widget, WPanel *panel);
+static void popup_handle_arrange_icons (GtkWidget *widget, WPanel *panel);
+static void popup_handle_logout (GtkWidget *widget, WPanel *panel);
+
+/* global vars */
+extern int we_can_afford_the_speed;
+
+static action file_actions[] = {
+	{ N_("Properties"),      F_SINGLE | F_ALL,   	  	 (GtkSignalFunc) popup_handle_properties },
+	{ "",                    F_SINGLE | F_ALL,  	  	 NULL },
+	{ N_("Open"),            F_NOTDEV,		  	 (GtkSignalFunc) popup_handle_open },
+	{ "",                    F_NOTDEV,   	    	  	 NULL },
+	{ N_("Open with..."),    F_REGULAR | F_SINGLE, 	  	 (GtkSignalFunc) popup_handle_open_with },
+	{ N_("View"),            F_REGULAR | F_SINGLE,		 (GtkSignalFunc) popup_handle_view },
+	{ N_("View unfiltered"), F_REGULAR | F_ADVANCED | F_SINGLE,      	 (GtkSignalFunc) popup_handle_view_unfiltered },  
+	{ N_("Edit"),            F_REGULAR | F_SINGLE,     	 (GtkSignalFunc) popup_handle_edit },
+	{ "",                    F_REGULAR | F_SINGLE,         	 NULL },
+	{ N_("Copy..."),         F_ALL,             		 (GtkSignalFunc) popup_handle_copy },
+	{ N_("Delete"),          F_ALL,             		 (GtkSignalFunc) popup_handle_delete },
+	{ N_("Move..."),         F_ALL,             		 (GtkSignalFunc) popup_handle_move },
+	{ "", 			 F_SINGLE, 			 NULL }, 
+	{ N_("Hard Link..."),    F_ADVANCED | F_SINGLE,		 (GtkSignalFunc) popup_handle_hard_link }, /* UGH.  I can't believe this exists. */
+	{ N_("Link..."),    F_SINGLE, 	                 (GtkSignalFunc) popup_handle_symlink },
+	{ N_("Edit symlink..."), F_SYMLINK | F_SINGLE,           (GtkSignalFunc) popup_handle_edit_symlink },
+	{ NULL, 0, NULL }
+};
+
+static action generic_actions[] = {
+	{ N_("NEW(FIXME)"),      F_ALL,	 	  	  	 NULL },
+	{ "",                    F_ALL,   	    	  	 NULL },
+	{ N_("Change Background"),F_DICON,		      	 (GtkSignalFunc) popup_handle_display_properties },
+	{ N_("Refresh"),         F_ALL,		      	  	 (GtkSignalFunc) popup_handle_refresh },
+	{ N_("Arrange Icons"),   F_DICON,			 (GtkSignalFunc) popup_handle_arrange_icons },
+	{ N_(""),                F_DICON,             		 NULL },
+	{ N_("Logout"),          F_DICON,             		 (GtkSignalFunc) popup_handle_logout },
+	{ NULL, 0, NULL }
+};
+
+
+
+/* This is our custom signal connection function for popup menu items -- see below for the
+ * marshaller information.  We pass the original callback function as the data pointer for the
+ * marshaller (uiinfo->moreinfo).
+ */
+static void
+popup_connect_func (GnomeUIInfo *uiinfo, gchar *signal_name, GnomeUIBuilderData *uibdata)
+{
+	g_assert (uibdata->is_interp);
+
+	if (uiinfo->moreinfo) {
+		gtk_object_set_data (GTK_OBJECT (uiinfo->widget), "popup_user_data", uiinfo->user_data);
+		gtk_signal_connect_full (GTK_OBJECT (uiinfo->widget), signal_name,
+					 NULL,
+					 uibdata->relay_func,
+					 uiinfo->moreinfo,
+					 uibdata->destroy_func,
+					 FALSE,
+					 FALSE);
+	}
+}
+
+/* Our custom marshaller for menu items.  We need it so that it can extract the per-attachment
+ * user_data pointer from the parent menu shell and pass it to the callback.  This overrides the
+ * user-specified data from the GnomeUIInfo structures.
+ */
+
+typedef void (* ActivateFunc) (GtkObject *object, WPanel *panel);
+
+static void
+popup_marshal_func (GtkObject *object, gpointer data, guint n_args, GtkArg *args)
+{
+	ActivateFunc func;
+	gpointer user_data;
+
+	func = (ActivateFunc) data;
+	user_data = gtk_object_get_data (object, "popup_user_data");
+
+	gtk_object_set_data (GTK_OBJECT (GTK_WIDGET (object)->parent), "popup_active_item", object);
+	(* func) (object, user_data);
+}
+
+/* Fills the menu with the specified uiinfo at the specified position, using our magic marshallers
+ * to be able to fetch the active item.  The code is shamelessly ripped from gnome-popup-menu.
+ */
+static void
+fill_menu (GtkMenuShell *menu_shell, GnomeUIInfo *uiinfo, int pos)
+{
+	GnomeUIBuilderData uibdata;
+
+	/* We use our own callback marshaller so that it can fetch the popup user data
+	 * from the popup menu and pass it on to the user-defined callbacks.
+	 */
+
+	uibdata.connect_func = popup_connect_func;
+	uibdata.data = NULL;
+	uibdata.is_interp = TRUE;
+	uibdata.relay_func = popup_marshal_func;
+	uibdata.destroy_func = NULL;
+
+	gnome_app_fill_menu_custom (menu_shell, uiinfo, &uibdata, NULL, FALSE, pos);
+}
+
+
+/* The context menu: text displayed, condition that must be met and the routine that gets invoked
+ * upon activation.
+ */
+
+
+/* Creates the menu items for the standard actions.  Returns the position at which additional menu
+ * items should be inserted.
+ */
+static int
+create_actions (GtkWidget *menu, gint flags, gboolean on_selected, WPanel *panel)
+{
+	struct action *action;
+	gint pos = 0;
+	gint error_correction;
+	GnomeUIInfo uiinfo[] = {
+		{ 0 },
+		GNOMEUIINFO_END
+	};
+
+	if (on_selected)
+		action = file_actions;
+	else
+		action = generic_actions;
+
+
+	for (;action->text; action++) {
+		error_correction = 0;
+		/* Let's see if we want this particular entry */
+		/* we need to special-case F_SINGLE */
+		if (action->flags & F_SINGLE) {
+			if  (!(flags & F_SINGLE))
+				continue;
+			else if (action->flags != F_SINGLE)
+				error_correction |= F_SINGLE;
+		}
+		/* same with advanced */
+		if (action->flags & F_ADVANCED) {
+			if  (!(flags & F_ADVANCED))
+				continue;
+			else
+				error_correction |= F_ADVANCED;
+		}
+
+		if ((flags & (action->flags - error_correction)) == 0)
+			continue;
+
+		if (action->text[0]) {
+			uiinfo[0].type = GNOME_APP_UI_ITEM;
+			uiinfo[0].label = _(action->text);
+			uiinfo[0].hint = NULL;
+			uiinfo[0].moreinfo = action->callback;
+			uiinfo[0].user_data = (gpointer) panel;
+			uiinfo[0].unused_data = NULL;
+			uiinfo[0].pixmap_type = GNOME_APP_PIXMAP_NONE;
+			uiinfo[0].pixmap_info = NULL;
+			uiinfo[0].accelerator_key = 0;
+			uiinfo[0].ac_mods = 0;
+			uiinfo[0].widget = NULL;
+		} else
+			uiinfo[0].type = GNOME_APP_UI_SEPARATOR;
+
+		fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos);
+		pos++;
+	}
+
+	return pos;
+}
+
+
+/* Convenience callback to exit the main loop of a modal popup menu when it is deactivated*/
+static void
+menu_shell_deactivated (GtkMenuShell *menu_shell, WPanel *panel)
+{
+	gtk_main_quit ();
+}
+
+/* Returns the index of the active item in the specified menu, or -1 if none is active */
+static int
+get_active_index (GtkMenu *menu)
+{
+	GList *l;
+	GtkWidget *active;
+	int i;
+
+	active = gtk_object_get_data (GTK_OBJECT (menu), "popup_active_item");
+
+	for (i = 0, l = GTK_MENU_SHELL (menu)->children; l; l = l->next, i++)
+		if (active == l->data)
+			return i;
+
+	return -1;
+}
+
+/*
+ * Create a context menu
+ * It can take either a WPanel or a GnomeDesktopEntry.  One of them should
+ * be set to NULL.
+ */
+#define REMOVE(x,f) if (x&f)x-=f
+
+int gpopup_do_popup2 (GdkEventButton *event,
+		      WPanel *panel, GList *file_list,
+		      gboolean on_selected)
+{
+	GtkWidget *menu;
+	GList *list;
+	gint flags = F_ALL | F_REGULAR | F_SYMLINK | F_SINGLE | F_NOTDEV | F_NOTDIR;
+	struct stat s;
+	guint id;
+	gint i;
+	gint count = 0;
+
+	g_return_val_if_fail (event != NULL, -1);
+
+	menu = gtk_menu_new ();
+
+	/* Connect to the deactivation signal to be able to quit our
+           modal main loop */
+	id = gtk_signal_connect (GTK_OBJECT (menu), "deactivate",
+				 (GtkSignalFunc) menu_shell_deactivated,
+				 NULL);
+
+	if (file_list == NULL) {
+		/* make the file list */
+		for (i = 0; i < panel->count; i++) {
+			if (!strcmp (panel->dir.list [i].fname, "..")) {
+				continue;
+			}
+			if (panel->dir.list [i].f.marked) {
+				s.st_mode = panel->dir.list[i].buf.st_mode;
+				/* do flag stuff */
+				if (S_ISLNK (s.st_mode))
+					mc_stat (panel->dir.list [i].fname, &s);
+				else
+					REMOVE (flags, F_SYMLINK);
+				if (S_ISDIR (s.st_mode))
+					REMOVE (flags, F_NOTDIR);
+				if (!S_ISREG (s.st_mode))
+					REMOVE (flags, F_REGULAR);
+				if (count == 1)
+					REMOVE (flags, F_SINGLE);
+				if (!S_ISREG (s.st_mode) && !S_ISDIR (s.st_mode))
+					REMOVE (flags, F_NOTDEV);
+				count++;
+			}
+		}
+	} else {
+		/* we already have the file list, but we need to create the flags */
+		for (list = file_list; list; list = list->next) {
+			mc_lstat (list->data, &s);
+			if (S_ISLNK (s.st_mode))
+				mc_stat (list->data, &s);
+			else
+				REMOVE (flags, F_SYMLINK);
+			     
+			if (S_ISDIR (s.st_mode))
+				REMOVE (flags, F_NOTDIR);
+			if (!S_ISREG (s.st_mode))
+				REMOVE (flags, F_REGULAR);
+			if (count == 1)
+				REMOVE (flags, F_SINGLE);
+			if (!S_ISREG (s.st_mode) && !S_ISDIR (s.st_mode))
+				REMOVE (flags, F_NOTDEV);
+			count++;
+		}
+	}
+
+	/* Fill the menu */
+	create_actions (menu, flags, on_selected, panel);
+
+	/* Run it */
+	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
+	gtk_grab_add (menu);
+	gtk_main ();
+	gtk_grab_remove (menu);
+
+	gtk_signal_disconnect (GTK_OBJECT (menu), id);
+	/* FIXME: FIXME: FIXME: free the stoopid memory */
+	return get_active_index (GTK_MENU (menu));
+}
+
+static void
+panel_action_open_with (GtkWidget *widget, WPanel *panel)
+{
+	char *command;
+	
+	command = input_expand_dialog (_(" Open with..."),
+				       _("Enter extra arguments:"), panel->dir.list [panel->selected].fname);
+	if (!command)
+		return;
+	execute (command);
+	 g_free (command);
+}
+static void
+popup_handle_open (GtkWidget *widget, WPanel *panel)
+{
+	if (do_enter (panel))
+		return;
+	panel_action_open_with (widget, panel);
+}
+static void
+popup_handle_view (GtkWidget *widget, WPanel *panel)
+{
+	view_cmd (panel);
+}
+static void
+popup_handle_view_unfiltered (GtkWidget *widget, WPanel *panel)
+{
+	view_simple_cmd (panel);
+}
+static void
+popup_handle_edit (GtkWidget *widget, WPanel *panel)
+{
+	edit_cmd (panel);
+}
+static void
+popup_handle_copy (GtkWidget *widget, WPanel *panel)
+{
+	copy_cmd ();
+}
+static void
+popup_handle_delete (GtkWidget *widget, WPanel *panel)
+{
+	delete_cmd ();
+}
+static void
+popup_handle_move (GtkWidget *widget, WPanel *panel)
+{
+	ren_cmd ();
+}
+
+/* F_SINGLE file commands */
+static void popup_handle_properties (GtkWidget *widget, WPanel *panel)
+{
+	gint retval;
+	file_entry *fe = &panel->dir.list [panel->selected];
+	char *full_name = concat_dir_and_file (panel->cwd, fe->fname);
+	GtkWidget *dlg;
+
+/*	if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0)
+	reread_cmd ();*/
+	dlg = gnome_file_property_dialog_new (full_name, we_can_afford_the_speed);
+	gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (gtk_widget_get_toplevel (panel->ministatus)));
+	if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0)
+		retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg));
+	
+	gtk_widget_destroy (dlg);
+	 g_free (full_name);
+	if (retval)
+		reread_cmd ();
+}
+static void popup_handle_open_with (GtkWidget *widget, WPanel *panel)
+{
+	char *command;
+	
+	command = input_expand_dialog (_(" Open with..."),
+				       _("Enter extra arguments:"), panel->dir.list [panel->selected].fname);
+	if (!command)
+		return;
+	execute (command);
+	g_free (command);
+}
+static void popup_handle_hard_link (GtkWidget *widget, WPanel *panel)
+{
+	/* yeah right d:  -jrb */
+	link_cmd ();
+}
+static void popup_handle_symlink (GtkWidget *widget, WPanel *panel)
+{
+	symlink_cmd ();
+}
+static void popup_handle_edit_symlink (GtkWidget *widget, WPanel *panel)
+{
+	edit_symlink_cmd ();
+}
+static void popup_handle_display_properties (GtkWidget *widget, WPanel *panel)
+{
+
+}
+static void popup_handle_refresh (GtkWidget *widget, WPanel *panel)
+{
+
+}
+static void popup_handle_arrange_icons (GtkWidget *widget, WPanel *panel)
+{
+
+}
+static void popup_handle_logout (GtkWidget *widget, WPanel *panel)
+{
+
+}
diff -ruN old/mc-4.5.11/gnome/gscreen.c new/mc-4.5.12/gnome/gscreen.c
--- old/mc-4.5.11/gnome/gscreen.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gscreen.c	Sun Feb  7 02:53:34 1999
@@ -1363,8 +1363,7 @@
 	switch (event->type){
 	case GDK_BUTTON_PRESS:
 		if (event->button.button == 3)
-			gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index,
-					 panel->dir.list[index].fname);
+			gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, TRUE);
 		break;
 
 	case GDK_BUTTON_RELEASE:
@@ -1430,9 +1429,10 @@
 
 	icon = gnome_icon_list_get_icon_at (gil, event->x, event->y);
 
-	if (icon == -1)
-		panel->maybe_start_drag = 0;
-	else {
+	if (icon == -1) {
+		if (event->button == 3)
+			gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, FALSE);
+	} else {
 		if (event->button != 3)
 			panel->maybe_start_drag = event->button;
 	}
@@ -2424,21 +2424,17 @@
 	else if (panel->list_type == list_user)
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (viewbar[3].widget), TRUE);
 
-	/*
-	 * Here we make the view buttons.
-	 */
-	status_line = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+	status_line = gtk_hbox_new (FALSE, 2);
 	gtk_container_set_border_width (GTK_CONTAINER (status_line), 3);
-	evbox = gtk_event_box_new ();
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_container_add (GTK_CONTAINER (evbox), hbox);
-	gtk_toolbar_append_widget (GTK_TOOLBAR (status_line),
-				   evbox,
-				   NULL, NULL);
-	gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("Location:")), FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), cwd, TRUE, TRUE, 0);
-	dock =  gnome_dock_item_new ("gmc-toolbar1", GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL);
-	gtk_container_add (GTK_CONTAINER(dock),status_line);
+	gtk_box_pack_start (GTK_BOX (status_line),
+                            gtk_label_new (_("Location:")), FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (status_line),
+                            cwd, TRUE, TRUE, 0);
+        
+	dock =  gnome_dock_item_new ("gmc-toolbar1",
+                                     (GNOME_DOCK_ITEM_BEH_EXCLUSIVE
+                                      | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL));
+	gtk_container_add (GTK_CONTAINER(dock), status_line);
 	gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock),
 			     GNOME_DOCK_ITEM (dock), GNOME_DOCK_TOP, 1, 0, 0, FALSE);
 	
diff -ruN old/mc-4.5.11/gnome/gtkdtree.c new/mc-4.5.12/gnome/gtkdtree.c
--- old/mc-4.5.11/gnome/gtkdtree.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gtkdtree.c	Sun Feb  7 02:53:34 1999
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include "dir-open.xpm"
 #include "dir-close.xpm"
+#include "main.h"
 #include "treestore.h"
 #include "gtkdtree.h"
 
@@ -101,19 +102,17 @@
 static GtkCTreeNode *
 gtk_dtree_insert_node (GtkDTree *dtree, GtkCTreeNode *parent, char *text)
 {
-	GtkCTreeNode *sibling;
 	char *texts [1];
 
 	texts [0] = text;
-	
-	sibling = gtk_ctree_insert_node (
-		GTK_CTREE (dtree), parent, NULL,
-		texts, TREE_SPACING,
-		dtree->pixmap_close,
-		dtree->bitmap_close,
-		dtree->pixmap_open,
-		dtree->bitmap_open,
-		FALSE, FALSE);
+
+	return gtk_ctree_insert_node (GTK_CTREE (dtree), parent, NULL,
+				      texts, TREE_SPACING,
+				      dtree->pixmap_close,
+				      dtree->bitmap_close,
+				      dtree->pixmap_open,
+				      dtree->bitmap_open,
+				      FALSE, FALSE);
 }
 
 static gboolean
@@ -136,12 +135,12 @@
 	for (; (dirent = tree_store_readdir (dir)) != NULL; ){
 		GtkCTreeNode *sibling;
 		char *text;
-		
+
 		text = x_basename (dirent->name);
 
 		/* Do not insert duplicates */
 		sibling = gtk_dtree_contains (dtree, parent, text);
-		
+
 		if (sibling == NULL)
 			sibling = gtk_dtree_insert_node (dtree, parent, text);
 
@@ -164,6 +163,9 @@
 	GtkDTree *dtree = GTK_DTREE (ctree);
 	char *path;
 
+	if (dtree->removing_rows)
+		return;
+	
 	parent_class->tree_select_row (ctree, row, column);
 
 	if (row == dtree->last_node)
@@ -214,16 +216,17 @@
 
 	node = GTK_CTREE_ROW (parent)->children;
 	
-	while (node && GTK_CTREE_ROW (node)->parent == parent){
+	while (node){
 		char *text;
-		
-		gtk_ctree_node_get_pixtext (
-			GTK_CTREE (dtree), node, 0, &text,
-			NULL, NULL, NULL);
-
-		if (strcmp (dirname, text) == 0)
-			return node;
 
+		if (GTK_CTREE_ROW (node)->parent == parent){
+			gtk_ctree_node_get_pixtext (
+				GTK_CTREE (dtree), node, 0, &text,
+				NULL, NULL, NULL);
+			
+			if (strcmp (dirname, text) == 0)
+				return node;
+		}
 		node = GTK_CTREE_NODE_NEXT (node);
 	}
 
@@ -333,7 +336,7 @@
 {
 	GtkDTree *dtree = GTK_DTREE (widget);
 	char *request;
-	
+
 	GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
 	if (allocation->width != 0 && allocation->height != 0)
 		dtree->visible = TRUE;
@@ -348,7 +351,7 @@
 
 	if (!dtree->requested_path)
 		return;
-	
+
 	if (strcmp (dtree->current_path, dtree->requested_path) == 0){
 		g_free (dtree->requested_path);
 		dtree->requested_path = NULL;
@@ -392,8 +395,11 @@
 			break;
 		copy = NULL;
 	}
-	if (current == NULL && current_node)
+	if (current == NULL && current_node){
+		dtree->removing_rows = 1;
 		gtk_ctree_remove_node (GTK_CTREE (data), current_node);
+		dtree->removing_rows = 0;
+	}
 	
 	g_free (dirname);
 }
@@ -405,16 +411,17 @@
  * into the treestore.  We update the gtkdtree with this new information.
  */
 static void
-entry_added_callback (tree_entry *tree, void *data)
+entry_added_callback (char *dirname, void *data)
 {
 	GtkCTreeNode *current_node, *new_node;
 	GtkDTree *dtree = data;
-	char *dirname, *copy, *current, *npath, *full_path;
+	char *copy, *current, *npath, *full_path;
 
 	if (dtree->loading_dir)
 		return;
-	
-	copy = dirname = g_strdup (tree->name);
+
+	dirname = g_strdup (dirname);
+	copy = dirname;
 	copy++;
 	current_node = dtree->root_node;
 	npath = g_strdup ("/");
diff -ruN old/mc-4.5.11/gnome/gtkdtree.h new/mc-4.5.12/gnome/gtkdtree.h
--- old/mc-4.5.11/gnome/gtkdtree.h	Thu Feb  4 21:34:16 1999
+++ new/mc-4.5.12/gnome/gtkdtree.h	Sun Feb  7 02:53:35 1999
@@ -34,6 +34,7 @@
 	unsigned short internal;
 	unsigned short loading_dir;
 	int *show_dot_files;
+	unsigned short removing_rows;
 } GtkDTree;
 
 typedef struct {
diff -ruN old/mc-4.5.11/gnome/gtools.c new/mc-4.5.12/gnome/gtools.c
--- old/mc-4.5.11/gnome/gtools.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gtools.c	Sun Feb  7 02:53:34 1999
@@ -4,16 +4,16 @@
  * Written by Miguel de Icaza
  */
 #include <config.h>
-#include "myslang.h"
+#include "global.h"
 #include <gnome.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
-#include "global.h"
 #include "gconf.h"
 #include "dlg.h"
 #undef HAVE_LIBGPM
 #include "mouse.h"
 #include "key.h"
+#include "myslang.h"
 #include "widget.h"
 #include "wtools.h"
 #include "dialog.h"
diff -ruN old/mc-4.5.11/gnome/gutil.c new/mc-4.5.12/gnome/gutil.c
--- old/mc-4.5.11/gnome/gutil.c	Thu Feb  4 21:34:15 1999
+++ new/mc-4.5.12/gnome/gutil.c	Sun Feb  7 02:53:34 1999
@@ -95,11 +95,7 @@
 		 */
 		_exit (0);
 	}
-	if (*pid != 0 && (flags & EXECUTE_WAIT)){
-		int status;
-		
-		waitpid (*pid, &status, 0);
-	}
+	waitpid (*pid, &status, 0);
 	sigaction (SIGINT,  &save_intr, NULL);
 	sigaction (SIGQUIT, &save_quit, NULL);
 	sigaction (SIGTSTP, &save_stop, NULL);
diff -ruN old/mc-4.5.11/po/cat-id-tbl.c new/mc-4.5.12/po/cat-id-tbl.c
--- old/mc-4.5.11/po/cat-id-tbl.c	Thu Feb  4 21:34:18 1999
+++ new/mc-4.5.12/po/cat-id-tbl.c	Sun Feb  7 02:53:43 1999
@@ -640,10 +640,7 @@
   {"\
  Not an xterm or Linux console; \n\
  the panels cannot be toggled. ", 600},
-  {"\
-Type `exit' to return to the Midnight Commander\n\
-\r\n\
-\r", 601},
+  {"Type `exit' to return to the Midnight Commander", 601},
   {"\
  Couldn't stat %s \n\
  %s ", 602},
diff -ruN old/mc-4.5.11/po/mc.pot new/mc-4.5.12/po/mc.pot
--- old/mc-4.5.11/po/mc.pot	Thu Feb  4 21:34:18 1999
+++ new/mc-4.5.12/po/mc.pot	Sun Feb  7 02:53:43 1999
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-02-04 19:44-0600\n"
+"POT-Creation-Date: 1999-02-07 01:53-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,20 +148,20 @@
 msgid "Command: "
 msgstr ""
 
-#: gnome/gcmd.c:557
+#: gnome/gcmd.c:574
 msgid "Set Filter"
 msgstr ""
 
-#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612
-#: gnome/gscreen.c:2489
+#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629
+#: gnome/gscreen.c:2485
 msgid "Show all files"
 msgstr ""
 
-#: gnome/gcmd.c:569
+#: gnome/gcmd.c:586
 msgid "."
 msgstr ""
 
-#: gnome/gcmd.c:585
+#: gnome/gcmd.c:602
 msgid ""
 "Enter a filter here for files in the panel view.\n"
 "\n"
@@ -169,37 +169,37 @@
 "*.gif will show just gif images"
 msgstr ""
 
-#: gnome/gcmd.c:587
+#: gnome/gcmd.c:604
 msgid "Enter a Regular Expression to filter files in the panel view."
 msgstr ""
 
-#: gnome/gcmd.c:644 gnome/gpopup.c:49
+#: gnome/gcmd.c:661 gnome/gpopup.c:49
 msgid " Open with..."
 msgstr ""
 
-#: gnome/gcmd.c:645 gnome/gpopup.c:50
+#: gnome/gcmd.c:662 gnome/gpopup.c:50
 msgid "Enter extra arguments:"
 msgstr ""
 
-#: gnome/gdesktop.c:347 gnome/gdesktop.c:1490
+#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553
 msgid "Warning"
 msgstr ""
 
-#: gnome/gdesktop.c:348
+#: gnome/gdesktop.c:351
 #, c-format
 msgid "Could not open %s; will not have desktop icons"
 msgstr ""
 
-#: gnome/gdesktop.c:1456
+#: gnome/gdesktop.c:1519
 msgid "Trashcan"
 msgstr ""
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1486
+#: gnome/gdesktop.c:1549
 msgid "Home directory"
 msgstr ""
 
-#: gnome/gdesktop.c:1491
+#: gnome/gdesktop.c:1554
 #, c-format
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
 msgstr ""
@@ -342,24 +342,24 @@
 msgid " Done."
 msgstr ""
 
-#: gnome/gdnd.c:50
+#: gnome/gdnd.c:51
 msgid "_Move here"
 msgstr ""
 
-#: gnome/gdnd.c:51
+#: gnome/gdnd.c:52
 msgid "_Copy here"
 msgstr ""
 
-#: gnome/gdnd.c:52
+#: gnome/gdnd.c:53
 msgid "_Link here"
 msgstr ""
 
-#: gnome/gdnd.c:54
+#: gnome/gdnd.c:55
 msgid "Cancel drag"
 msgstr ""
 
 #. FIXME: this error message sucks
-#: gnome/gdnd.c:190
+#: gnome/gdnd.c:191
 #, c-format
 msgid ""
 "Could not stat %s\n"
@@ -594,52 +594,52 @@
 msgid "File/New/Directory..."
 msgstr ""
 
-#: gnome/gpopup.c:215 gnome/gpopup.c:216
+#: gnome/gpopup.c:222 gnome/gpopup.c:223
 msgid "Properties"
 msgstr ""
 
-#: gnome/gpopup.c:218 gnome/gpopup.c:219
+#: gnome/gpopup.c:225 gnome/gpopup.c:226
 msgid "Open"
 msgstr ""
 
-#: gnome/gpopup.c:220
+#: gnome/gpopup.c:227
 msgid "Open with"
 msgstr ""
 
-#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316
+#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316
 msgid "View"
 msgstr ""
 
-#: gnome/gpopup.c:222
+#: gnome/gpopup.c:229
 msgid "View unfiltered"
 msgstr ""
 
-#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287
+#: gnome/gpopup.c:230 gtkedit/gtkedit.c:1366 src/screen.c:2287
 #: src/screen.c:2317 src/view.c:1968
 msgid "Edit"
 msgstr ""
 
-#: gnome/gpopup.c:225
+#: gnome/gpopup.c:232
 msgid "Link..."
 msgstr ""
 
-#: gnome/gpopup.c:226
+#: gnome/gpopup.c:233
 msgid "Symlink..."
 msgstr ""
 
-#: gnome/gpopup.c:227
+#: gnome/gpopup.c:234
 msgid "Edit symlink..."
 msgstr ""
 
-#: gnome/gpopup.c:234 gnome/gpopup.c:245
+#: gnome/gpopup.c:241 gnome/gpopup.c:252
 msgid "Move/rename..."
 msgstr ""
 
-#: gnome/gpopup.c:235 gnome/gpopup.c:246
+#: gnome/gpopup.c:242 gnome/gpopup.c:253
 msgid "Copy..."
 msgstr ""
 
-#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067
+#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067
 #: src/screen.c:2291 src/screen.c:2321
 msgid "Delete"
 msgstr ""
@@ -972,7 +972,7 @@
 msgid "Go to your home directory"
 msgstr ""
 
-#: gnome/gscreen.c:2438
+#: gnome/gscreen.c:2430
 msgid "Location:"
 msgstr ""
 
@@ -2572,115 +2572,112 @@
 msgstr ""
 
 #: src/cmd.c:967
-msgid ""
-"Type `exit' to return to the Midnight Commander\n"
-"\r\n"
-"\r"
+msgid "Type `exit' to return to the Midnight Commander"
 msgstr ""
 
-#: src/cmd.c:1020
+#: src/cmd.c:1022
 #, c-format
 msgid ""
 " Couldn't stat %s \n"
 " %s "
 msgstr ""
 
-#: src/cmd.c:1029 src/cmd.c:1031
+#: src/cmd.c:1031 src/cmd.c:1033
 msgid " Link "
 msgstr ""
 
-#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621
+#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621
 msgid " to:"
 msgstr ""
 
-#: src/cmd.c:1041
+#: src/cmd.c:1043
 #, c-format
 msgid " link: %s "
 msgstr ""
 
-#: src/cmd.c:1074
+#: src/cmd.c:1076
 #, c-format
 msgid " symlink: %s "
 msgstr ""
 
-#: src/cmd.c:1100
+#: src/cmd.c:1102
 msgid " Symlink "
 msgstr ""
 
-#: src/cmd.c:1100
+#: src/cmd.c:1102
 msgid " points to:"
 msgstr ""
 
-#: src/cmd.c:1105
+#: src/cmd.c:1107
 msgid " Edit symlink "
 msgstr ""
 
-#: src/cmd.c:1111
+#: src/cmd.c:1113
 #, c-format
 msgid " edit symlink: %s "
 msgstr ""
 
-#: src/cmd.c:1135
+#: src/cmd.c:1137
 msgid " Link symbolically "
 msgstr ""
 
-#: src/cmd.c:1136
+#: src/cmd.c:1138
 msgid " Relative symlink "
 msgstr ""
 
-#: src/cmd.c:1147
+#: src/cmd.c:1149
 #, c-format
 msgid " relative symlink: %s "
 msgstr ""
 
-#: src/cmd.c:1250
+#: src/cmd.c:1252
 msgid " Enter machine name (F1 for details): "
 msgstr ""
 
-#: src/cmd.c:1274
+#: src/cmd.c:1276
 #, c-format
 msgid " Could not chdir to %s "
 msgstr ""
 
-#: src/cmd.c:1281
+#: src/cmd.c:1283
 msgid " Link to a remote machine "
 msgstr ""
 
-#: src/cmd.c:1287
+#: src/cmd.c:1289
 msgid " FTP to machine "
 msgstr ""
 
-#: src/cmd.c:1297
+#: src/cmd.c:1299
 msgid " Socket source routing setup "
 msgstr ""
 
-#: src/cmd.c:1298
+#: src/cmd.c:1300
 msgid " Enter host name to use as a source routing hop: "
 msgstr ""
 
-#: src/cmd.c:1305
+#: src/cmd.c:1307
 msgid " Host name "
 msgstr ""
 
-#: src/cmd.c:1305
+#: src/cmd.c:1307
 msgid " Error while looking up IP address "
 msgstr ""
 
-#: src/cmd.c:1316
+#: src/cmd.c:1318
 msgid " Undelete files on an ext2 file system "
 msgstr ""
 
-#: src/cmd.c:1317
+#: src/cmd.c:1319
 msgid ""
 " Enter device (without /dev/) to undelete\n"
 "   files on: (F1 for details)"
 msgstr ""
 
-#: src/cmd.c:1367
+#: src/cmd.c:1369
 msgid " Setup saved to ~/"
 msgstr ""
 
-#: src/cmd.c:1372
+#: src/cmd.c:1374
 msgid " Setup "
 msgstr ""
 
@@ -4999,7 +4996,7 @@
 msgid "Inconsistent tar archive"
 msgstr ""
 
-#: vfs/tar.c:412
+#: vfs/tar.c:411
 #, c-format
 msgid ""
 "Hmm,...\n"
diff -ruN old/mc-4.5.11/src/ChangeLog new/mc-4.5.12/src/ChangeLog
--- old/mc-4.5.11/src/ChangeLog	Thu Feb  4 21:34:14 1999
+++ new/mc-4.5.12/src/ChangeLog	Sun Feb  7 02:53:31 1999
@@ -1,3 +1,40 @@
+1999-02-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* treestore.c 	(tree_store_add_entry): Use g_new0 to allocate the tree_entry.
+
+	(tree_store_notify_add): Close, but no cigar.  The
+	bug was deeper:  This list keeps names, not tree_entries.
+
+1999-02-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* treestore.c (tree_store_notify_add): A tree_store_add_fn wants a
+	string, not a tree_entry, so pass a string to it.
+
+1999-02-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* treestore.c: Revert all of the stack changes.  Now the treestore
+	is again non-re-entrant.  Being re-entrat was only covering up for
+	bugs in other places.
+
+	Now we postpone notifications for additions at
+	tree_store_end_check, not before.
+
+1999-02-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* treestore.c (tree_store_remove_entry): Removed unused code for
+	base_sublevel computation.
+
+Sun Feb  7 06:11:48 1999  Timur Bakeyev  <mc@bat.ru>
+
+	* Makefile.in: Change calls to xmkdir to mkinstalldirs - this is more
+	GNU-like :)
+	
+	* xmkdir removed - we have mkinstalldirs.
+
+1999-02-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* cmd.c (view_other_cmd): Do not use \r in translatable strings. 
+
 1999-02-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* widget.c (push_history): Only do check the history headings if
diff -ruN old/mc-4.5.11/src/Makefile.in new/mc-4.5.12/src/Makefile.in
--- old/mc-4.5.11/src/Makefile.in	Thu Feb  4 21:34:14 1999
+++ new/mc-4.5.12/src/Makefile.in	Sun Feb  7 02:53:30 1999
@@ -55,7 +55,7 @@
 
 DISTFILES = \
 	$(HDRS) $(SRCS) Makefile.in TODO ChangeLog OChangeLog man2hlp.c \
-	gindex.pl xmkdir cons.saver.c ncurses.patch mc.hlp depend.awk \
+	gindex.pl cons.saver.c ncurses.patch mc.hlp depend.awk \
 	fixhlp.c mfmt.c
 
 # Should be: mc $(srcdir)/mc.hlp but it's remaking it always
diff -ruN old/mc-4.5.11/src/cmd.c new/mc-4.5.12/src/cmd.c
--- old/mc-4.5.11/src/cmd.c	Thu Feb  4 21:34:13 1999
+++ new/mc-4.5.12/src/cmd.c	Sun Feb  7 02:53:30 1999
@@ -964,7 +964,9 @@
 	{
 	    if (output_starts_shell){
 		fprintf (stderr,
-		 _("Type `exit' to return to the Midnight Commander\n\r\n\r"));
+		 _("Type `exit' to return to the Midnight Commander"));
+		fprintf (stderr, "\n\r\n\r");
+			 
 		my_system (EXECUTE_AS_SHELL, shell, NULL);
 	    } else
 		get_key_code (0);
diff -ruN old/mc-4.5.11/src/treestore.c new/mc-4.5.12/src/treestore.c
--- old/mc-4.5.11/src/treestore.c	Thu Feb  4 21:34:14 1999
+++ new/mc-4.5.12/src/treestore.c	Sun Feb  7 02:53:30 1999
@@ -85,10 +85,10 @@
         /etc.old/X11
         /etc.old/rc.d
         /usr
-       
+
    i.e. the required collating sequence when comparing two directory names is 
         '\0' < PATH_SEP < all-other-characters-in-encoding-order
-   
+
     Since strcmp doesn't fulfil this requirement we use pathcmp when
     inserting directory names into the list. The meaning of the return value 
     of pathcmp and strcmp are the same (an integer less than, equal to, or 
@@ -129,14 +129,14 @@
 		return NULL;
 }
 
-
 TreeStore *
 tree_store_init (void)
 {
 	ts.tree_first = 0;
 	ts.tree_last = 0;
 	ts.refcount++;
-
+	ts.check_name = NULL;
+	
 	return &ts;
 }
 
@@ -386,7 +386,7 @@
 		return current; /* Already in the list */
 
 	/* Not in the list -> add it */
-	new = g_new (tree_entry, 1);
+	new = g_new0 (tree_entry, 1);
 	if (!current){
 		/* Append to the end of the list */
 		if (!ts.tree_first){
@@ -466,9 +466,9 @@
 	tree_entry *current = entry->prev;
 	long submask = 0;
 	tree_entry *ret = NULL;
-	
+
 	tree_store_notify_remove (entry);
-	
+
 	/* Correct the submasks of the previous entries */
 	if (entry->next)
 		submask = entry->next->submask;
@@ -478,17 +478,18 @@
 		current->submask = submask;
 		current = current->prev;
 	}
-	
+
 	/* Unlink the entry from the list */
 	if (entry->prev)
 		entry->prev->next = entry->next;
 	else
 		ts.tree_first = entry->next;
+
 	if (entry->next)
 		entry->next->prev = entry->prev;
 	else
 		ts.tree_last = entry->prev;
-	
+
 	/* Free the memory used by the entry */
 	g_free (entry->name);
 	g_free (entry);
@@ -501,10 +502,9 @@
 {
 	tree_entry *current, *base, *old;
 	int len, base_sublevel;
-	char *check_name;
 	
 	g_return_if_fail (name != NULL);
-	g_return_if_fail (ts.check_name_list != NULL);
+	g_return_if_fail (ts.check_name != NULL);
 	
 	/* Miguel Ugly hack */
 	if (name [0] == PATH_SEP && name [1] == 0)
@@ -515,17 +515,16 @@
 	if (!base)
 		return;	/* Doesn't exist */
 
-	check_name = ts.check_name_list->data;
-	
-	if (check_name [0] == PATH_SEP && check_name [1] == 0)
+	if (ts.check_name [0] == PATH_SEP && ts.check_name [1] == 0)
 		base_sublevel = base->sublevel;
 	else
 		base_sublevel = base->sublevel + 1;
+
 	len = strlen (base->name);
 	current = base->next;
 	while (current
 	       && strncmp (current->name, base->name, len) == 0
-	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP)){
+	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP)) {
 		old = current;
 		current = current->next;
 		remove_entry (old);
@@ -543,37 +542,33 @@
 	char *name;
 	tree_entry *current, *base;
 	int flag = 1, len;
-	char *check_name;
-	
 	if (!ts.loaded)
 		return;
 
-	if (ts.check_name_list == NULL)
+	if (ts.check_name == NULL)
 		return;
 	
-	check_name = ts.check_name_list->data;
-	
 	/* Calculate the full name of the subdirectory */
 	if (subname [0] == '.' &&
 	    (subname [1] == 0 || (subname [1] == '.' && subname [2] == 0)))
 		return;
-	if (check_name [0] == PATH_SEP && check_name [1] == 0)
+	if (ts.check_name [0] == PATH_SEP && ts.check_name [1] == 0)
 		name = g_strconcat (PATH_SEP_STR, subname, NULL);
 	else
-		name = concat_dir_and_file (check_name, subname);
+		name = concat_dir_and_file (ts.check_name, subname);
 	
 	/* Search for the subdirectory */
 	current = ts.check_start;
 	while (current && (flag = pathcmp (current->name, name)) < 0)
 		current = current->next;
-	
+
 	if (flag != 0){
 		/* Doesn't exist -> add it */
 		current = tree_store_add_entry (name);
-		tree_store_notify_add (current);
+		ts.add_queue = g_list_prepend (ts.add_queue, g_strdup (name));
 	}
 	g_free (name);
-	
+
 	/* Clear the deletion mark from the subdirectory and its children */
 	base = current;
 	if (base){
@@ -595,13 +590,13 @@
 {
 	tree_entry *current, *retval;
 	int len;
-	char *check_name;
 
 	if (!ts.loaded)
 		return NULL;
 
+	g_assert (ts.check_name == NULL);
 	ts.check_start = NULL;
-	
+
 	/* Search for the start of subdirectories */
 	current = tree_store_whereis (path);
 	if (!current){
@@ -612,25 +607,24 @@
 
 		if (!S_ISDIR (s.st_mode))
 			return NULL;
-		
+
 		current = tree_store_add_entry (path);
-		ts.check_name_list = g_list_prepend (ts.check_name_list, g_strdup (path));
+		ts.check_name = g_strdup (path);
 
 		return current;
 	}
 
-	ts.check_name_list = g_list_prepend (ts.check_name_list, g_strdup (path));
+	ts.check_name = g_strdup (path);
 	
 	retval = current;
-	
+
 	/* Mark old subdirectories for delete */
 	ts.check_start = current->next;
-	check_name = ts.check_name_list->data;
-	len = strlen (check_name);
+	len = strlen (ts.check_name);
 	
 	current = ts.check_start;
 	while (current
-	       && strncmp (current->name, check_name, len) == 0
+	       && strncmp (current->name, ts.check_name, len) == 0
 	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
 		current->mark = 1;
 		current = current->next;
@@ -654,21 +648,19 @@
 {
 	tree_entry *current, *old;
 	int len;
-	char *check_name;
-	GList *list_head;
+	GList *the_queue, *l;
 	
 	if (!ts.loaded)
 		return;
 
-	g_return_if_fail (ts.check_name_list);
+	g_assert (ts.check_name != NULL);
 	
 	/* Check delete marks and delete if found */
-	check_name = ts.check_name_list->data;
-	len = strlen (check_name);
+	len = strlen (ts.check_name);
 	
 	current = ts.check_start;
 	while (current
-	       && strncmp (current->name, check_name, len) == 0
+	       && strncmp (current->name, ts.check_name, len) == 0
 	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
 		old = current;
 		current = current->next;
@@ -676,10 +668,19 @@
 			remove_entry (old);
 	}
 
-	g_free (ts.check_name_list->data);
-	list_head = ts.check_name_list;
-	ts.check_name_list = list_head->next;
-	g_list_free_1 (list_head);
+	/* get the stuff in the scan order */
+	ts.add_queue = g_list_reverse (ts.add_queue);
+	the_queue = ts.add_queue;
+	ts.add_queue = NULL;
+	g_free (ts.check_name);
+	ts.check_name = NULL;
+	
+	for (l = the_queue; l; l = l->next){
+		tree_store_notify_add (l->data);
+		g_free (l->data);
+	}
+	
+	g_list_free (the_queue);
 }
 
 tree_entry *
@@ -761,15 +762,14 @@
 }
 
 void
-tree_store_notify_add (tree_entry *entry)
+tree_store_notify_add (char *directory)
 {
 	Hook *p = add_entry_hooks;
 	tree_store_add_fn r;
-
 	
-	while (p){
+	while (p) {
 		r = (tree_store_add_fn) p->hook_fn;
-		r (entry, p->hook_data);
+		r (directory, p->hook_data);
 		p = p->next;
 	}
 }
@@ -781,7 +781,7 @@
 	tree_scan *scan;
 
 	entry = tree_store_whereis (path);
-	if (!entry || (entry && !entry->scanned)){
+	if (!entry || (entry && !entry->scanned)) {
 		entry = tree_store_rescan (path);
 
 		if (!entry)
@@ -790,12 +790,12 @@
 
 	if (entry->next == NULL)
 		return NULL;
-	
+
 	scan = g_new (tree_scan, 1);
 	scan->base = entry;
 	scan->current = entry->next;
 	scan->sublevel = entry->next->sublevel;
-	
+
 	scan->base_dir_len = strlen (path);
 	return scan;
 }
diff -ruN old/mc-4.5.11/src/treestore.h new/mc-4.5.12/src/treestore.h
--- old/mc-4.5.11/src/treestore.h	Thu Feb  4 21:34:12 1999
+++ new/mc-4.5.12/src/treestore.h	Sun Feb  7 02:53:28 1999
@@ -24,7 +24,8 @@
 	tree_entry *tree_first;     	/* First entry in the list */
 	tree_entry *tree_last;          /* Last entry in the list */
 	tree_entry *check_start;	/* Start of checked subdirectories */
-	GList      *check_name_list;
+	char       *check_name;
+	GList      *add_queue;		/* List of strings of added directories */
 	unsigned int loaded : 1;
 	unsigned int dirty : 1;
 } TreeStore;
@@ -54,20 +55,21 @@
 void        tree_store_remove_entry_remove_hook (tree_store_remove_fn callback);
 
 /*
- * Register/unregister notification functions for "entry_remove"
+ * Register/unregister notification functions for "entry_add"
  */
-typedef void (*tree_store_add_fn)(tree_entry *tree, void *data);
-void        tree_store_add_entry_add_hook    (tree_store_remove_fn callback, void *data);
-void        tree_store_remove_entry_add_hook (tree_store_remove_fn callback);
+typedef void (*tree_store_add_fn)(char *name, void *data);
+void        tree_store_add_entry_add_hook    (tree_store_add_fn callback, void *data);
+void        tree_store_remove_entry_add_hook (tree_store_add_fn callback);
 
 /*
  * Changes in the tree_entry are notified with these
  */
 void        tree_store_notify_remove   (tree_entry *entry);
-void        tree_store_notify_add (tree_entry *entry);
+void        tree_store_notify_add      (char *directory);
 
 tree_scan  *tree_store_opendir       (char *path);
 tree_entry *tree_store_readdir       (tree_scan *scanner);
 void        tree_store_closedir      (tree_scan *scanner);
 
 #endif
+
diff -ruN old/mc-4.5.11/src/xmkdir new/mc-4.5.12/src/xmkdir
--- old/mc-4.5.11/src/xmkdir	Thu Feb  4 21:34:14 1999
+++ new/mc-4.5.12/src/xmkdir	Wed Dec 31 19:00:00 1969
@@ -1,32 +0,0 @@
-#!/bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do 
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" || errstatus=$?
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff -ruN old/mc-4.5.11/vfs/ChangeLog new/mc-4.5.12/vfs/ChangeLog
--- old/mc-4.5.11/vfs/ChangeLog	Thu Feb  4 21:34:09 1999
+++ new/mc-4.5.12/vfs/ChangeLog	Sun Feb  7 02:53:25 1999
@@ -1,3 +1,7 @@
+Sat Feb  6 23:44:28 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* tar.c (read_header): Treat hardlinks correctly.
+
 Mon Feb  1 19:32:12 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* ftpfs.c (insert_dots): renamed from insert_dot. We have to 
diff -ruN old/mc-4.5.11/vfs/Make-mc.in new/mc-4.5.12/vfs/Make-mc.in
--- old/mc-4.5.11/vfs/Make-mc.in	Thu Feb  4 21:34:09 1999
+++ new/mc-4.5.12/vfs/Make-mc.in	Sun Feb  7 02:53:25 1999
@@ -51,6 +51,7 @@
 	tcputil.c		\
 	undelfs.c 		\
 	utilvfs.c		\
+	util-alone.c		\
 	vfs.c
 
 VFSHDRS = 			\
@@ -64,6 +65,7 @@
 	tcputil.h 		\
 	utilvfs.h		\
 	vfs.h			\
+	util-alone.h		\
 	xdirentry.h
 
 VFSOBJS = $(NONETFILES) @NETFILES@
diff -ruN old/mc-4.5.11/vfs/tar.c new/mc-4.5.12/vfs/tar.c
--- old/mc-4.5.11/vfs/tar.c	Thu Feb  4 21:34:09 1999
+++ new/mc-4.5.12/vfs/tar.c	Sun Feb  7 02:53:25 1999
@@ -341,11 +341,10 @@
 	}
 
 	if (header->header.linkflag == LF_LINK) {
-	    parent = vfs_s_find_inode (me, archive->root, current_link_name, LINK_NO_FOLLOW, 0);
-	    if (parent == NULL) {
+	    inode = vfs_s_find_inode (me, archive->root, current_link_name, LINK_NO_FOLLOW, 0);
+	    if (inode == NULL) {
 	        message_1s (1, MSG_ERROR, _("Inconsistent tar archive"));
 	    } else {
-	        inode = parent;
 		entry = vfs_s_new_entry(me, p, inode);
 		vfs_s_insert_entry(me, parent, entry);
 		g_free (current_link_name);
diff -ruN old/mc-4.5.11/vfs/util-alone.c new/mc-4.5.12/vfs/util-alone.c
--- old/mc-4.5.11/vfs/util-alone.c	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.12/vfs/util-alone.c	Sun Feb  7 02:53:25 1999
@@ -0,0 +1,207 @@
+/*
+ * Author: 1998 Pavel Machek <pavel@ucw.cz>
+ *
+ * This is for making midnight commander's vfs stuff compile stand-alone
+ *
+ * Namespace pollution: horrible
+ */
+
+#include <config.h>
+#include <stdio.h>
+#if defined(__os2__)            /* OS/2 need io.h! .ado */
+#    include <io.h>
+#endif
+#include <stdlib.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <signal.h>		/* my_system */
+#include <limits.h>		/* INT_MAX */
+#ifndef SCO_FLAVOR
+#	include <sys/time.h>	/* alex: sys/select.h defines struct timeval */
+#endif /* SCO_FLAVOR */
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdarg.h>
+#include <errno.h>		/* my_system */
+#ifdef SCO_FLAVOR
+#	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
+#endif /* SCO_FLAVOR */
+#include <time.h>
+#ifndef OS2_NT
+#   include <pwd.h>
+#   include <grp.h>
+#endif
+#include <string.h>
+#include <ctype.h>
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
+
+#ifdef __linux__
+#    if defined(__GLIBC__) && (__GLIBC__ < 2)
+#        include <linux/termios.h>	/* This is needed for TIOCLINUX */
+#    else
+#        include <termios.h>
+#    endif
+#  include <sys/ioctl.h>
+#endif
+
+#include "../src/util.h"
+#include "vfs.h"
+#include "callback.h"
+
+#ifndef VFS_STANDALONE
+#error This has only sense when compiling standalone version
+#endif
+
+int source_route = 0;
+int cd_symlinks = 0;
+
+/*
+ * We do not want/need many of midnight's functions, stub routines.
+ */
+
+void
+enable_interrupt_key (void)
+{
+}
+
+void
+disable_interrupt_key (void)
+{
+}
+
+int  got_interrupt (void)
+{
+	return 0;
+}
+
+void
+rotate_dash (void)
+{
+}
+
+char *
+load_anon_passwd (void)
+{
+	return NULL;
+}
+
+static char (*callbacks[NUM_CALLBACKS])(char *msg) = { NULL, NULL, NULL, };
+
+void
+vfs_set_callback (int num, void *func)
+{
+    if (num >= NUM_CALLBACKS)
+        vfs_die ("Attempt to set invalid callback.\n");
+    callbacks [num] = func;
+}
+
+static void
+info_puts( char *s )
+{
+    if (!callbacks [CALL_INFO])
+        fprintf (stderr, "%s\n", s);
+    else
+        callbacks [CALL_INFO](s);
+}
+
+static void
+box_puts( char *s )
+{
+    if (!callbacks [CALL_BOX])
+        fprintf (stderr, "%s\n", s);
+    else
+        callbacks [CALL_BOX](s);
+}
+
+char *
+vfs_get_password (char *msg)
+{
+    if (!callbacks [CALL_PASSWD])
+        return NULL;
+    else
+        callbacks [CALL_PASSWD](msg);
+}
+
+void
+print_vfs_message (char *msg, ...)
+{
+    char *str;
+    va_list args;
+
+    va_start  (args,msg);
+    str = g_strdup_vprintf (msg, args);
+    va_end    (args);
+
+    info_puts (str);
+    g_free (str);
+}
+
+void
+wipe_password (char *passwd)
+{
+    char *p = passwd;
+
+    if (p == NULL)
+	    return;
+    
+    for (;*p; p++)
+        *p = 0;
+    g_free (passwd);
+}
+
+int
+exist_file (char *name)
+{
+    return access (name, R_OK) == 0;
+}
+
+void
+message_1s (int i, char *c1, char *c2)
+{
+    char buf [4096];
+
+    snprintf (buf, sizeof (buf), "%s %s", c1, c2);
+    box_puts (buf);
+}
+
+void
+message_2s (int i, char *c1, char *c2, char *c3)
+{
+    char buf [4096];
+    
+    snprintf (buf, sizeof (buf), "%s %s %s", c1, c2, c3 );
+    box_puts (buf );
+}
+
+void
+message_3s( int i, char *c1, char *c2, char *c3, const char *c4 )
+{
+    char buf [4096];
+    
+    snprintf (buf, sizeof (buf), "%s %s %s %s", c1, c2, c3, c4);
+    box_puts (buf);
+}
+
+void vfs_init( void );
+void ftpfs_init_passwd( void );
+
+char *mc_home = LIBDIR;
+
+void
+mc_vfs_init( void )
+{
+    vfs_init();
+    ftpfs_init_passwd();
+}
+
+void
+mc_vfs_done( void )
+{
+    vfs_shut();
+}