diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/ChangeLog xfce-3.2.2/ChangeLog
--- xfce-3.2.1/ChangeLog	Fri Dec  3 22:22:38 1999
+++ xfce-3.2.2/ChangeLog	Fri Dec  3 21:16:47 1999
@@ -1,3 +1,7 @@
+14-NOV-1999: XFce 3.2.2
+- scripts
+  * improve xfterm to accept any kind of command line options
+  
 30-NOV-1999: XFce 3.2.1
 - All
   * Add Swedish translation, thanks to Joakim Andreasson 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/Makefile.in xfce-3.2.2/Makefile.in
--- xfce-3.2.1/Makefile.in	Fri Dec  3 22:22:38 1999
+++ xfce-3.2.2/Makefile.in	Sat Dec  4 10:19:37 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -118,7 +119,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -295,7 +296,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -337,7 +338,7 @@
 all-am: Makefile config.h
 all-redirect: all-recursive-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/aclocal.m4 xfce-3.2.2/aclocal.m4
--- xfce-3.2.1/aclocal.m4	Fri Dec  3 22:22:38 1999
+++ xfce-3.2.2/aclocal.m4	Sat Dec  4 10:19:31 1999
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -592,6 +592,8 @@
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/configure xfce-3.2.2/configure
--- xfce-3.2.1/configure	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/configure	Sat Dec  4 10:19:45 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.14.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -351,7 +351,7 @@
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.14.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -511,7 +511,7 @@
 
 if test -r "$cache_file"; then
   echo "loading cache $cache_file"
-  . $cache_file
+      test -f "$cache_file" && . $cache_file
 else
   echo "creating cache $cache_file"
   > $cache_file
@@ -555,40 +555,54 @@
 if test -z "$ac_aux_dir"; then
   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:565: checking host system type" >&5
+if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then
+
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+  if $ac_config_sub sun4 >/dev/null 2>&1; then :
+    else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+  fi
+
+  ac_cv_host_alias=$host
+  case "$ac_cv_host_alias" in
+  NONE)
+    case $nonopt in
+    NONE)
+      if ac_cv_host_alias=`$ac_config_guess`; then :
+      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+      fi ;;
+    *) ac_cv_host_alias=$nonopt ;;
+    esac ;;
+  esac
+
+  ac_cv_host=`$ac_config_sub $ac_cv_host_alias`
+  ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+  ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+  ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+else
+  echo $ac_n "(cached) $ac_c" 1>&6
 fi
 
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:570: checking host system type" >&5
+echo "$ac_t""$ac_cv_host" 1>&6
+
+host=$ac_cv_host
+host_alias=$ac_cv_host_alias
+host_cpu=$ac_cv_host_cpu
+host_vendor=$ac_cv_host_vendor
+host_os=$ac_cv_host_os
+
 
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
 
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
 
 
 XFCE_PACKAGE=xfce
-XFCE_VERSION=3.2.1
+XFCE_VERSION=3.2.2
 
 
 
@@ -607,9 +621,9 @@
 # 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:611: checking for a BSD compatible install" >&5
+echo "configure:625: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_path_install+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -627,6 +641,10 @@
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -655,12 +673,12 @@
 # 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_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:664: checking whether build environment is sane" >&5
+echo "configure:682: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -708,18 +726,18 @@
   rm -f conftestsed
 fi
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+  program_transform_name="s,^,${program_prefix},;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
 
 # sed with no file args requires a program.
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:721: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:739: 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
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftestmake <<\EOF
@@ -744,6 +762,7 @@
 fi
 
 
+
 PACKAGE=$XFCE_PACKAGE
 
 VERSION=$XFCE_VERSION
@@ -763,7 +782,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:767: checking for working aclocal" >&5
+echo "configure:786: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -776,7 +795,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:780: checking for working autoconf" >&5
+echo "configure:799: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -789,7 +808,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:793: checking for working automake" >&5
+echo "configure:812: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -802,7 +821,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:806: checking for working autoheader" >&5
+echo "configure:825: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -815,7 +834,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:819: checking for working makeinfo" >&5
+echo "configure:838: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -831,8 +850,8 @@
 # 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:835: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:854: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -861,8 +880,8 @@
   # 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:865: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:884: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -908,12 +927,12 @@
 
   if test -z "$CC"; then
     case "`uname -s`" in
-    *win32* | *WIN32*)
+    *win32* | *WIN32* | *CYGWIN*)
       # 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:916: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:935: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -943,8 +962,8 @@
   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:948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:967: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -955,12 +974,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 959 "configure"
+#line 978 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -985,14 +1004,14 @@
 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:990: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:1009: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $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:995: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+echo "configure:1014: checking whether we are using GNU C" >&5
+if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.c <<EOF
@@ -1000,7 +1019,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1004: \"$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:1023: \"$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
@@ -1019,8 +1038,8 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1023: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+echo "configure:1042: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo 'void f(){}' > conftest.c
@@ -1051,7 +1070,7 @@
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1055: checking for POSIXized ISC" >&5
+echo "configure:1074: 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
@@ -1074,8 +1093,8 @@
 # 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:1078: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:1097: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -1104,8 +1123,8 @@
   # 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:1108: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:1127: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -1151,12 +1170,12 @@
 
   if test -z "$CC"; then
     case "`uname -s`" in
-    *win32* | *WIN32*)
+    *win32* | *WIN32* | *CYGWIN*)
       # 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:1159: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "configure:1178: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -1186,8 +1205,8 @@
   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:1191: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1210: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1198,12 +1217,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1202 "configure"
+#line 1221 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1228,14 +1247,14 @@
 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:1233: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:1252: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $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:1238: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+echo "configure:1257: checking whether we are using GNU C" >&5
+if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.c <<EOF
@@ -1243,7 +1262,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1247: \"$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:1266: \"$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
@@ -1262,8 +1281,8 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1266: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+echo "configure:1285: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo 'void f(){}' > conftest.c
@@ -1297,8 +1316,8 @@
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1301: checking for ${CC-cc} option to accept ANSI C" >&5
-if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
+echo "configure:1320: checking for ${CC-cc} option to accept ANSI C" >&5
+if eval "test \"\${am_cv_prog_cc_stdc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   am_cv_prog_cc_stdc=no
@@ -1313,7 +1332,7 @@
 do
   CC="$ac_save_CC $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 1317 "configure"
+#line 1336 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -1350,7 +1369,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -1374,13 +1393,13 @@
 esac
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1378: checking how to run the C preprocessor" >&5
+echo "configure:1397: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     # This must be in double quotes, not single quotes, because CPP may get
@@ -1389,13 +1408,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1393 "configure"
+#line 1412 "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:1399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1418: \"$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
   :
@@ -1406,13 +1425,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1410 "configure"
+#line 1429 "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:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1435: \"$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
   :
@@ -1423,13 +1442,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1427 "configure"
+#line 1446 "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:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1452: \"$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
   :
@@ -1454,12 +1473,12 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1458: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+echo "configure:1477: checking for ANSI C header files" >&5
+if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1463 "configure"
+#line 1482 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1467,7 +1486,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1484,7 +1503,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 1488 "configure"
+#line 1507 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1502,7 +1521,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 1506 "configure"
+#line 1525 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1523,7 +1542,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1527 "configure"
+#line 1546 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1534,7 +1553,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1558,9 +1577,9 @@
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1562: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1581: 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
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftestmake <<\EOF
@@ -1596,9 +1615,9 @@
 # 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:1600: checking for a BSD compatible install" >&5
+echo "configure:1619: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_path_install+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -1616,6 +1635,10 @@
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -1644,15 +1667,15 @@
 # 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_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # 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:1655: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+echo "configure:1678: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
@@ -1681,12 +1704,12 @@
 
 ALL_LINGUAS="ca da de es fi fr gl it ja pl ru sv"
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1685: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+echo "configure:1708: checking for working const" >&5
+if eval "test \"\${ac_cv_c_const+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1690 "configure"
+#line 1713 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1735,7 +1758,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1756,21 +1779,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1760: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+echo "configure:1783: checking for inline" >&5
+if eval "test \"\${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 1767 "configure"
+#line 1790 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1796,12 +1819,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1800: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+echo "configure:1823: checking for off_t" >&5
+if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1805 "configure"
+#line 1828 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1812,29 +1835,31 @@
 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
   rm -rf conftest*
-  ac_cv_type_off_t=yes
+  eval "ac_cv_type_off_t=yes"
 else
   rm -rf conftest*
-  ac_cv_type_off_t=no
+  eval "ac_cv_type_off_t=no"
 fi
 rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
+if eval "test \"`echo '$ac_cv_type_'off_t`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<EOF
 #define off_t long
 EOF
 
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1833: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+echo "configure:1858: checking for size_t" >&5
+if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1838 "configure"
+#line 1863 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1845,17 +1870,19 @@
 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
   rm -rf conftest*
-  ac_cv_type_size_t=yes
+  eval "ac_cv_type_size_t=yes"
 else
   rm -rf conftest*
-  ac_cv_type_size_t=no
+  eval "ac_cv_type_size_t=no"
 fi
 rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
+if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<EOF
 #define size_t unsigned
 EOF
 
@@ -1864,19 +1891,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:1868: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+echo "configure:1895: checking for working alloca.h" >&5
+if eval "test \"\${ac_cv_header_alloca_h+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1873 "configure"
+#line 1900 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1897,12 +1924,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1901: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+echo "configure:1928: checking for alloca" >&5
+if eval "test \"\${ac_cv_func_alloca_works+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1906 "configure"
+#line 1933 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1930,7 +1957,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1962,12 +1989,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1966: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+echo "configure:1993: checking whether alloca needs Cray hooks" >&5
+if eval "test \"\${ac_cv_os_cray+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1971 "configure"
+#line 1998 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1992,12 +2019,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:1996: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:2023: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2001 "configure"
+#line 2028 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2006,6 +2033,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -2015,12 +2043,12 @@
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2047,15 +2075,15 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2051: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+echo "configure:2079: checking stack direction for C alloca" >&5
+if eval "test \"\${ac_cv_c_stack_direction+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2059 "configure"
+#line 2087 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2074,7 +2102,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2099,17 +2127,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2103: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:2131: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2108 "configure"
+#line 2136 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2138,12 +2166,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2142: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:2170: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2147 "configure"
+#line 2175 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2152,6 +2180,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -2161,12 +2190,12 @@
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2191,15 +2220,15 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2195: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+echo "configure:2224: checking for working mmap" >&5
+if eval "test \"\${ac_cv_func_mmap_fixed_mapped+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2203 "configure"
+#line 2232 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2339,7 +2368,7 @@
 }
 
 EOF
-if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2367,17 +2396,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2371: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:2400: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2376 "configure"
+#line 2405 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2407,12 +2436,12 @@
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2411: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:2440: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2416 "configure"
+#line 2445 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2421,6 +2450,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -2430,12 +2460,12 @@
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2464,12 +2494,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2468: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:2498: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2473 "configure"
+#line 2503 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2478,6 +2508,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -2487,12 +2518,12 @@
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2526,19 +2557,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2530: checking for LC_MESSAGES" >&5
-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+echo "configure:2561: checking for LC_MESSAGES" >&5
+if eval "test \"\${am_cv_val_LC_MESSAGES+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2535 "configure"
+#line 2566 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2559,7 +2590,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2563: checking whether NLS is requested" >&5
+echo "configure:2594: 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"
@@ -2579,7 +2610,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2583: checking whether included gettext is requested" >&5
+echo "configure:2614: 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"
@@ -2598,17 +2629,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2602: checking for libintl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:2633: checking for libintl.h" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2607 "configure"
+#line 2638 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2625,19 +2656,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:2629: checking for gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+echo "configure:2660: checking for gettext in libc" >&5
+if eval "test \"\${gt_cv_func_gettext_libc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2634 "configure"
+#line 2665 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -2653,15 +2684,15 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2657: checking for bindtextdomain in -lintl" >&5
+echo "configure:2688: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2665 "configure"
+#line 2696 "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
@@ -2672,7 +2703,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2688,19 +2719,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:2692: checking for gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+echo "configure:2723: checking for gettext in libintl" >&5
+if eval "test \"\${gt_cv_func_gettext_libintl+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2697 "configure"
+#line 2728 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -2728,8 +2759,8 @@
 	      # 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:2732: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:2763: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_MSGFMT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$MSGFMT" in
@@ -2762,12 +2793,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2766: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:2797: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2771 "configure"
+#line 2802 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2776,6 +2807,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -2785,12 +2817,12 @@
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2817,8 +2849,8 @@
 		# 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:2821: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:2853: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
@@ -2853,8 +2885,8 @@
 		# 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:2857: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:2889: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$XGETTEXT" in
@@ -2885,7 +2917,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 2889 "configure"
+#line 2921 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2893,7 +2925,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -2916,7 +2948,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2920: checking whether catgets can be used" >&5
+echo "configure:2952: 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"
@@ -2929,22 +2961,22 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2933: checking for main in -li" >&5
+echo "configure:2965: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2941 "configure"
+#line 2973 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2972,12 +3004,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2976: checking for catgets" >&5
-if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
+echo "configure:3008: checking for catgets" >&5
+if eval "test \"\${ac_cv_func_catgets+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
+#line 3013 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -2986,6 +3018,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char catgets();
+char (*f)();
 
 int main() {
 
@@ -2995,12 +3028,12 @@
 #if defined (__stub_catgets) || defined (__stub___catgets)
 choke me
 #else
-catgets();
+f = catgets;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3022,8 +3055,8 @@
 	       # 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:3026: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
+echo "configure:3059: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_GENCAT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GENCAT" in
@@ -3058,8 +3091,8 @@
 		 # 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:3062: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:3095: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
@@ -3095,8 +3128,8 @@
 		   # 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:3099: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:3132: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
@@ -3130,8 +3163,8 @@
 		 # 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:3134: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:3167: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$XGETTEXT" in
@@ -3188,8 +3221,8 @@
         # 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:3192: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:3225: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_MSGFMT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$MSGFMT" in
@@ -3222,8 +3255,8 @@
         # 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:3226: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:3259: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_GMSGFMT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
@@ -3258,8 +3291,8 @@
         # 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:3262: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:3295: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_XGETTEXT+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$XGETTEXT" in
@@ -3348,7 +3381,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3352: checking for catalogs to be installed" >&5
+echo "configure:3385: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3376,17 +3409,17 @@
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3380: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:3413: checking for linux/version.h" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3385 "configure"
+#line 3418 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3456,17 +3489,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3460: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:3493: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3465 "configure"
+#line 3498 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3496,17 +3529,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3500: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:3533: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3505 "configure"
+#line 3538 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3536,17 +3569,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3540: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:3573: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3545 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3573,12 +3606,12 @@
 done
 
 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:3577: checking whether stat file-mode macros are broken" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
+echo "configure:3610: checking whether stat file-mode macros are broken" >&5
+if eval "test \"\${ac_cv_header_stat_broken+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3582 "configure"
+#line 3615 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3633,12 +3666,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:3637: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+echo "configure:3670: checking for $ac_hdr that defines DIR" >&5
+if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3675 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3646,7 +3679,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3671,15 +3704,15 @@
 # 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:3675: checking for opendir in -ldir" >&5
+echo "configure:3708: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3683 "configure"
+#line 3716 "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
@@ -3690,7 +3723,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3712,15 +3745,15 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3716: checking for opendir in -lx" >&5
+echo "configure:3749: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3724 "configure"
+#line 3757 "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
@@ -3731,7 +3764,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3754,12 +3787,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3758: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+echo "configure:3791: checking for working const" >&5
+if eval "test \"\${ac_cv_c_const+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3763 "configure"
+#line 3796 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3808,7 +3841,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3829,21 +3862,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3833: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+echo "configure:3866: checking for inline" >&5
+if eval "test \"\${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 3840 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3869,12 +3902,12 @@
 esac
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3873: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+echo "configure:3906: checking whether time.h and sys/time.h may both be included" >&5
+if eval "test \"\${ac_cv_header_time+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3878 "configure"
+#line 3911 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3883,7 +3916,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3908,7 +3941,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:3912: checking for X" >&5
+echo "configure:3945: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -3925,7 +3958,7 @@
     # Both variables are already set.
     have_x=yes
   else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_have_x+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -3970,12 +4003,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 3974 "configure"
+#line 4007 "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:3979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4044,14 +4077,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4048 "configure"
+#line 4081 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -4157,17 +4190,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:4161: checking whether -R must be followed by a space" >&5
+echo "configure:4194: 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 4164 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4183,14 +4216,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4187 "configure"
+#line 4220 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4222,15 +4255,15 @@
     # 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:4226: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4259: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4234 "configure"
+#line 4267 "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
@@ -4241,7 +4274,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4263,15 +4296,15 @@
 
     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:4267: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4300: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4275 "configure"
+#line 4308 "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
@@ -4282,7 +4315,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4311,12 +4344,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:4315: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+echo "configure:4348: checking for gethostbyname" >&5
+if eval "test \"\${ac_cv_func_gethostbyname+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4320 "configure"
+#line 4353 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4325,6 +4358,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char gethostbyname();
+char (*f)();
 
 int main() {
 
@@ -4334,12 +4368,12 @@
 #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
 choke me
 #else
-gethostbyname();
+f = gethostbyname;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4360,15 +4394,15 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4364: checking for gethostbyname in -lnsl" >&5
+echo "configure:4398: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4372 "configure"
+#line 4406 "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
@@ -4379,7 +4413,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4409,12 +4443,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:4413: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+echo "configure:4447: checking for connect" >&5
+if eval "test \"\${ac_cv_func_connect+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4418 "configure"
+#line 4452 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4423,6 +4457,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char connect();
+char (*f)();
 
 int main() {
 
@@ -4432,12 +4467,12 @@
 #if defined (__stub_connect) || defined (__stub___connect)
 choke me
 #else
-connect();
+f = connect;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4458,15 +4493,15 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4462: checking for connect in -lsocket" >&5
+echo "configure:4497: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4470 "configure"
+#line 4505 "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
@@ -4477,7 +4512,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4501,12 +4536,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:4505: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+echo "configure:4540: checking for remove" >&5
+if eval "test \"\${ac_cv_func_remove+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4510 "configure"
+#line 4545 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -4515,6 +4550,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char remove();
+char (*f)();
 
 int main() {
 
@@ -4524,12 +4560,12 @@
 #if defined (__stub_remove) || defined (__stub___remove)
 choke me
 #else
-remove();
+f = remove;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -4550,15 +4586,15 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4554: checking for remove in -lposix" >&5
+echo "configure:4590: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4562 "configure"
+#line 4598 "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
@@ -4569,7 +4605,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4593,12 +4629,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4597: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+echo "configure:4633: checking for shmat" >&5
+if eval "test \"\${ac_cv_func_shmat+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4602 "configure"
+#line 4638 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -4607,6 +4643,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char shmat();
+char (*f)();
 
 int main() {
 
@@ -4616,12 +4653,12 @@
 #if defined (__stub_shmat) || defined (__stub___shmat)
 choke me
 #else
-shmat();
+f = shmat;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -4642,15 +4679,15 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4646: checking for shmat in -lipc" >&5
+echo "configure:4683: 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
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4654 "configure"
+#line 4691 "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
@@ -4661,7 +4698,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4694,15 +4731,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:4698: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4735: 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
+if eval "test \"\${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"
 cat > conftest.$ac_ext <<EOF
-#line 4706 "configure"
+#line 4743 "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
@@ -4713,7 +4750,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4739,12 +4776,12 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4743: checking return type of signal handlers" >&5
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+echo "configure:4780: checking return type of signal handlers" >&5
+if eval "test \"\${ac_cv_type_signal+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4748 "configure"
+#line 4785 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4761,7 +4798,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4782,12 +4819,12 @@
 for ac_func in snprintf vsnprintf strcasecmp strncasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4786: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:4823: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4791 "configure"
+#line 4828 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4796,6 +4833,7 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -4805,12 +4843,12 @@
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4885,8 +4923,8 @@
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4889: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+echo "configure:4927: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_GTK_CONFIG+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GTK_CONFIG" in
@@ -4920,7 +4958,7 @@
 
   min_gtk_version=1.2.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:4924: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:4962: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -4943,7 +4981,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 4947 "configure"
+#line 4985 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -5021,7 +5059,7 @@
 }
 
 EOF
-if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -5055,7 +5093,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 5059 "configure"
+#line 5097 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -5065,7 +5103,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:5069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -5106,17 +5144,17 @@
 
 ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
-echo "configure:5110: checking for X11/xpm.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:5148: checking for X11/xpm.h" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5115 "configure"
+#line 5153 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5138,8 +5176,8 @@
 
 ac_safe=`echo "$x_includes/X11/xpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $x_includes/X11/xpm.h""... $ac_c" 1>&6
-echo "configure:5142: checking for $x_includes/X11/xpm.h" >&5
-if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
+echo "configure:5180: checking for $x_includes/X11/xpm.h" >&5
+if eval "test \"\${ac_cv_file_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
@@ -5163,22 +5201,22 @@
 fi
 
 echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6
-echo "configure:5167: checking for main in -lXpm" >&5
+echo "configure:5205: checking for main in -lXpm" >&5
 ac_lib_var=`echo Xpm'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm -lX11 -lXpm $X_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5175 "configure"
+#line 5213 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5217,15 +5255,15 @@
 	 IMLIB_CFLAGS=`imlib-config --cflags`
 	 GDK_IMLIB_CFLAGS=`imlib-config --cflags-gdk`
 	 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5221: checking for Imlib_init in -lImlib" >&5
+echo "configure:5259: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lImlib $GFX_LIB_IMLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5229 "configure"
+#line 5267 "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
@@ -5236,7 +5274,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5260,15 +5298,15 @@
 fi
 
 	 echo $ac_n "checking for gdk_imlib_init in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5264: checking for gdk_imlib_init in -lgdk_imlib" >&5
+echo "configure:5302: checking for gdk_imlib_init in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'gdk_imlib_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk_imlib $GFX_LIB_GDK_IMLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5272 "configure"
+#line 5310 "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
@@ -5279,7 +5317,7 @@
 gdk_imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5315,7 +5353,7 @@
 
 
 echo $ac_n "checking XFce directory structure""... $ac_c" 1>&6
-echo "configure:5319: checking XFce directory structure" >&5
+echo "configure:5357: checking XFce directory structure" >&5
 if test "x$datadir" = "x\${prefix}/share" -o "x$prefix" = "xNONE"; then
   XFCE_DIR="/usr/share/xfce"
 else
@@ -5328,7 +5366,7 @@
 echo "$ac_t""XFCE_LOCALE_DIR set to $XFCE_LOCALE_DIR" 1>&6
 
 echo $ac_n "checking install CDE specific files""... $ac_c" 1>&6
-echo "configure:5332: checking install CDE specific files" >&5
+echo "configure:5370: checking install CDE specific files" >&5
 # Check whether --enable-dt or --disable-dt was given.
 if test "${enable_dt+set}" = set; then
   enableval="$enable_dt"
@@ -5342,7 +5380,7 @@
 
 
 echo $ac_n "checking compiler flags""... $ac_c" 1>&6
-echo "configure:5346: checking compiler flags" >&5
+echo "configure:5384: checking compiler flags" >&5
 if test "x$GCC" = "xyes"; then
   if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
     CFLAGS="$CFLAGS -Wall"
@@ -5439,7 +5477,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.14.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -5815,7 +5853,7 @@
 EOF
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
 
 
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/configure.in xfce-3.2.2/configure.in
--- xfce-3.2.1/configure.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/configure.in	Fri Dec  3 21:16:47 1999
@@ -9,7 +9,7 @@
 AC_CANONICAL_HOST
 
 XFCE_PACKAGE=xfce
-XFCE_VERSION=3.2.1
+XFCE_VERSION=3.2.2
 
 AC_SUBST(PACKAGE, $XFCE_PACKAGE)
 AC_SUBST(VERSION, $XFCE_VERSION)
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/changelog xfce-3.2.2/debian/changelog
--- xfce-3.2.1/debian/changelog	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/debian/changelog	Fri Dec  3 21:16:47 1999
@@ -1,3 +1,9 @@
+xfce (3.2.2-0.1) unstable; urgency=low
+
+  * Updates for XFce 3.2.2
+
+ -- Olivier Fourdan <fourdan@xfce.org>  Tue, 01 Dec 1999 18:16:30 +0200
+
 xfce (3.1.0-0.1) unstable; urgency=low
 
   * New upstream release. Somebody wants to take it over officially 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.Xclients xfce-3.2.2/debian/sample.Xclients
--- xfce-3.2.1/debian/sample.Xclients	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.Xclients	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+rm -f /tmp/Xrootenv.0
+rm -f /tmp/fvwmrc*
+
+if [ -f $HOME/.xinitrc ]; then
+	env > /tmp/Xrootenv.0
+	/bin/sh $HOME/.xinitrc
+	exit
+fi
+
+if [ -f $HOME/.fvwm2rc.m4 ]; then
+	RCFILE=$HOME/.fvwm2rc.m4
+else
+	RCFILE=/etc/X11/TheNextLevel/.fvwm2rc.m4
+fi
+
+if [ ! -z $(type -path fvwm95-2) ]; then
+	env > /tmp/Xrootenv.0
+	exec fvwm95-2 -f "FvwmM4 -debug $RCFILE" -display :0 \
+		> $HOME/.FVWM95-errors 2>&1
+fi
+
+if [ ! -z $(type -path fvwm2) ]; then
+	env > /tmp/Xrootenv.0
+	exec fvwm2 -f "FvwmM4 -debug $RCFILE" -display :0 \
+		> $HOME/.FVWM2-errors 2>&1
+fi
+
+if [ ! -z $(type -path fvwm) ]; then
+	exec fvwm
+fi
+
+# last resort
+
+xterm &
+exec twm
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.fvwm2rc xfce-3.2.2/debian/sample.fvwm2rc
--- xfce-3.2.1/debian/sample.fvwm2rc	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.fvwm2rc	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,216 @@
+MenuStyle Black #d3d3d3 black -adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-* mwm
+
+AddToDecor grad
++ ButtonStyle    1 5 25x40@1 75x40@1 75x60@0 25x60@0 25x40@1
++ ButtonStyle    2 5 25x25@1 75x25@1 75x75@0 25x75@0 25x25@1
++ ButtonStyle    4 5 40x40@1 60x40@1 60x60@0 40x60@0 40x40@1
++ TitleStyle     LeftJustified
++ AddTitleStyle  ActiveUp   HGradient 32 #000000 #c7686b
++ AddTitleStyle  ActiveDown HGradient 32 #000000 #c7686b
++ AddTitleStyle  Inactive   HGradient 32 #000000 #808080
++ HilightColor   #ffffe0 #c7686b
++ WindowFont     -*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*
++ IconFont       -*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*
+
+ModulePath 		/usr/X11R6/lib/X11/fvwm2:$PATH
+PixmapPath	     	/usr/include/X11/pixmaps
+IconPath	     	/usr/include/X11/bitmaps
+
+DeskTopSize 1x1
+OpaqueMoveSize 100
+
+Style "*" 		RandomPlacement
+Style "*"            	ClickToFocus
+Style "*"	     	MWMBorder
+Style "*"     	     	MWMButtons
+Style "*"            	HintOverride
+Style "*"            	MWMDecor
+Style "*"            	DecorateTransient
+Style "*"            	IconBox 5 -740 10 -5
+Style "*"		UseDecor grad
+Style "*"		Icon unknown1.xpm
+Style "*"		HandleWidth 5
+Style "*"		BorderWidth 4
+Style "*" 		Color #cfcfb0/#808080
+
+Style "Fvwm*"		NoTitle, NoHandles, Sticky, WindowListSkip,BorderWidth 2
+Style "XFce*"		Sticky
+Style "XFbd*"           Sticky 
+Style "Popup menu*"	Sticky
+Style "Alert*"		Sticky
+Style "Question*"	Sticky
+
+
+AddToFunc "InitFunction" 
++              "I" Module xfsound
++              "I" Module xfce -shared
++              "I" Desk 0 0
++              "I" Exec xfbd -d
++              "I" Exec xfmouse -d
+
+AddToFunc "RestartFunction" 
++              "I" Module xfsound
++              "I" Module xfce -shared
++              "I" Desk 0 0
++              "I" Exec xfbd -d
++              "I" Exec xfmouse -d
+
+AddToMenu "Quit-Verify" "Quit Fvwm? " Title
++              "Restart "    Restart fvwm2
++              "Quit "       Quit
++              ""            Nop
++              "Don't Quit " Nop
+
+AddToMenu "Module-Popup" "Modules" Title
++              "XFce" 		Module xfce -shared
++              "FvwmIdentify" 	Module FvwmIdent
++              "SaveDesktop" 	Module FvwmSave
++              "FvwmWinList" 	Module FvwmWinList
++	       "FvwmPager"	Module FvwmPager 0 3
+
+AddToMenu "Window-Ops2" "&Restore"      Iconify -1
++                       "&Move"         Move-or-Raise
++                       "&Size"         Resize-or-Raise
++                       "Mi&nimize"     Iconify 1
++                       "Ma&ximize"     Maximize 100 100
++			"&Cascade"	Module FvwmCascade -resize
++			"&Tile"		Module FvwmTile -nostretch 
++                       ""              Nop
++                       "&Exit"         Destroy
++                       "&Close Alt+F4" Delete
+
+AddToMenu "Root" "Root menu" Title
++              "New window" 	Exec xterm
++	       "Shuffle Up" 	Next [*] focus
++	       "Shuffle Down" 	Prev [*] focus
++	       "Refresh"	Refresh 
++              "" Nop
++	       "Mouse..."	Exec xfmouse -i
++              "" Nop
++	       "Backdrop..."	Exec xfbd -i
++              "" Nop
++ 	       "Sound..."       Exec xfsound
++ 	       "" Nop
++              "Window..."   	Popup Window-Ops2 
++              "" Nop
++              "Modules..." 	Popup Module-Popup
++              "" Nop
++              "Exit Fvwm" 	Popup Quit-Verify
+
+# This defines the most common window operations
+
+AddToMenu "Window" "Window Ops" Title
++ "&Move"                     Function Move-or-Raise
++ "&Resize"                   Function Resize-or-Raise
++ "R&aise"		      Raise
++ "&Lower"    		      Lower
++ "(De)Iconify"               Iconify
++ "(Un)Stick"                 Stick
++ "(Un)Maximize"              Maximize 100 100
++ ""                          Nop
++ "&Close"                    Delete
++ ""                          Nop
++ "Switch to..."              WindowList
++ "Refresh Screen" 	      Refresh
+
+AddToFunc "Iconify-and-Raise" "M" Iconify
++              "M" Raise
+
+AddToFunc "Move-or-Lower" "M" Move
++              "M" Lower
++              "C" Lower
++              "D" RaiseLower
+
+AddToFunc "Move-or-Iconify" "M" Move
++              "C" PopUp Window Ops2
++              "D" Iconify
+
+AddToFunc "windowops-or-die" "M" PopUp Window Ops2
++              "C" PopUp Window Ops2
++              "D" Close
+
+
+AddToFunc "Move-or-Raise" "M" Move
++              "M" Raise
++              "C" Raise
++              "D" Iconify
+
+AddToFunc "Move-or-Lower" "M" Move
++              "C" Lower
++              "D" RaiseLower
+
+AddToFunc "Resize-or-Raise" "M" Resize
++              "M" Raise
++              "C" Raise
++              "D" RaiseLower
+
+AddToFunc "Resize-or-Lower" "M" Resize
++              "C" Lower
++              "D" RaiseLower
+
+#     Button	Context Modifi 	Function
+Mouse 1		R   	A       Menu "Root" Nop
+Mouse 2		R    	A       Menu "Window" Nop
+Mouse 3		R    	A      	WindowList
+
+#     Button	Context Modifi 	Function
+Mouse 0		1    	A      	Function "windowops-or-die"
+Mouse 0		2    	A     	Maximize
+Mouse 0		4    	A     	Iconify
+
+Mouse 1         FS      A       Function "Resize-or-Raise"
+Mouse 2         FS      A       Function "Resize-or-Lower"
+Mouse 1         T       A       Function "Move-or-Raise"
+Mouse 2         T       A       Function "Move-or-Lower"
+
+Mouse 1		I	A	Function "Move-or-Iconify"
+Mouse 2		I	A	Function "Move-or-Iconify"
+Mouse 3		I	A 	Menu "Window Ops2" Nop
+Mouse 3		FST    	A      	Function "windowops-or-die"
+
+Key Left	A	C	Scroll -100 0
+Key Right	A	C	Scroll +100 +0
+Key Up		A	C	Scroll +0   -100
+Key Down	A	C	Scroll +0   +100
+
+Key Left	A	M	Scroll -10 +0
+Key Right	A	M	Scroll +10 +0
+Key Up		A	M	Scroll +0   -10
+Key Down	A	M	Scroll +0   +10
+
+Key Left	A	SC	CursorMove -1 0
+Key Right	A	SC	CursorMove +1 +0
+Key Up		A	SC	CursorMove +0   -1
+Key Down	A	SC	CursorMove +0   +1
+
+Key Left	A	SM	CursorMove -10 +0
+Key Right	A	SM	CursorMove +10 +0
+Key Up		A	SM	CursorMove +0   -10
+Key Down	A	SM	CursorMove +0   +10
+
+Key F1		A	M	Popup "Window"
+Key F2		A	M	Popup "Root"
+Key F3		A	M	Lower
+Key F4		A	M	Destroy
+Key F5		A	M	Next [*] focus
+Key F6		A	M	Prev [*] focus
+Key F7		A	M	Move
+Key F8		A	M	Resize
+Key F9		A	M	Iconify
+Key F10		A	M	Maximize
+
+Key L5                IW      N       RaiseLower
+Key L5                IW      S       Lower
+Key L5                IW      C       Raise
+Key L7                IW      A       Iconify
+
+
+*FvwmIdentBack MidnightBlue
+*FvwmIdentFore Yellow
+*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
+
+*FvwmWinListBack #908090
+*FvwmWinListFore Black
+*FvwmWinListFont -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
+*FvwmWinListUseSkipList
+*FvwmWinListGeometry +0-1
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.fvwmrc xfce-3.2.2/debian/sample.fvwmrc
--- xfce-3.2.1/debian/sample.fvwmrc	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.fvwmrc	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,232 @@
+HiForeColor 		#ffffe0	
+HiBackColor 		#c7686b
+StickyForeColor		Black
+StickyBackColor		#d3d3d3
+MenuForeColor           Black
+MenuBackColor           #d3d3d3
+MenuStippleColor        #d3d3d3
+Font			-adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*
+WindowFont		-adobe-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*
+
+MWMBorders
+MWMButtons
+MWMMenus
+MWMDecorHints
+DecorateTransients
+ClickToFocus
+#SloppyFocus
+
+ButtonStyle 1 50x22
+ButtonStyle 2 50x50
+ButtonStyle 4 22x22
+
+ModulePath 		/usr/lib/X11/fvwm:/usr/X11R6/bin:/usr/local/bin:/usr/X11/bin
+PixmapPath	     	/usr/include/X11/pixmaps
+IconPath	     	/usr/include/X11/bitmaps
+
+DeskTopSize 1x1
+DeskTopScale 32
+OpaqueMove 100 
+
+RandomPlacement
+
+Style "*" Color #cfcfb0/#808080,Icon unknown1.xpm,HandleWidth 5,BorderWidth 4
+
+Style "Fvwm*" 		Sticky, NoTitle, NoHandles, WindowListSkip,BorderWidth 2
+Style "XFce*" 		Sticky
+Style "XFbd*"           Sticky
+Style "Popup menu*" 	Sticky
+Style "Alert*"          Sticky
+Style "Question*"       Sticky
+
+Function "InitFunction"
+	Module  "I"	xfsound
+	Module	"I"	xfce -shared
+	Desk	"I"	0 0
+	Exec    "I"     xfbd -d
+	Exec    "I"     xfmouse -d
+EndFunction
+
+Function "RestartFunction"
+	Module  "I"	xfsound
+	Module  "I"     xfce -shared
+	Desk    "I"     0 0
+	Exec    "I"     xfbd -d
+	Exec    "I"     xfmouse -d
+EndFunction
+
+Popup "Quit-Verify"
+	Title	"End session ?"
+	Restart "Restart " fvwm
+	Quit	"Quit "
+EndPopup
+
+Popup "Module-Popup"
+	Title	"Modules"
+	Module  "XFce"		xfce -shared
+	Module	"Identify"	FvwmIdent
+	Module  "Save Desktop"  FvwmSave
+	Module  "WinList"       FvwmWinList
+	Module  "Pager"	        FvwmPager 0 3
+EndPopup
+
+Popup "Window-Ops2"
+	Move    "&Move	Alt+F7"
+	Resize  "&Size	Alt+F8" 
+	Iconify "(Un)Mi&nimize	Alt+F9"
+	Maximize "(Un)Ma&ximize	Alt+F10"
+	Lower   "&Lower	Alt+F3"
+	Nop     ""
+	Close   "&Close	Alt+F4"
+EndPopup
+
+Popup "Main menu"
+	Title 		"Main menu"
+	Exec    	"New window"	exec xterm
+	CirculateUp	"Shuffle Up"
+	CirculateDown	"Shuffle Down"	
+	Refresh		"Refresh"	
+	Nop		""
+	Exec		"Mouse..."	exec xfmouse -i
+	Nop		""
+	Exec		"Backdrop..."	exec xfbd -i
+	Nop		""
+        Exec		"Sound..."      exec xfsound
+	Nop		""
+	Popup		"Window..."	Window-Ops2
+	Nop		""
+	Popup		"Modules..."	Module-Popup
+	Nop		""
+	Popup		"Quit..."	Quit-Verify
+EndPopup
+
+Popup "Window Ops"
+	Title	"Window Ops	"
+	Move    "&Move	Alt+F7"
+	Resize  "&Size	Alt+F8" 
+	Lower   "&Lower	Alt+F3"
+	Raise   "Raise	"
+	Stick	"(Un)Stick	"
+	Iconify "(Un)Mi&nimize	Alt+F9"
+	Maximize "(Un)Ma&ximize	Alt+F10"
+	Maximize "(Un)Maximize Vertical	"	0 100
+	Nop     ""
+	Close   "&Close	Alt+F4"
+EndPopup
+
+Function "Iconify-and-Raise"
+	Iconify	"Motion"
+	Raise "Motion"
+EndPopup
+
+Function "Move-or-Lower"
+	Move 		"Motion"
+	Lower		"Motion"
+	Lower		"Click"
+	RaiseLower	"DoubleClick"
+EndFunction
+
+Function "Move-or-Iconify"
+	Move 		"Motion"
+	PopUp		"Click" Window-Ops2
+	Iconify		"DoubleClick"
+EndFunction
+
+Function "windowops-or-die"
+	PopUp		"Motion" Window-Ops2
+	PopUp		"Click" Window-Ops2
+	Close 	 	"DoubleClick"
+EndFunction
+
+Function "Move-or-Raise"
+	Move            "Motion"
+	Raise           "Motion"
+	Raise           "Click"
+	Iconify      	"DoubleClick" 
+EndFunction
+
+Function "Move-or-Lower"
+	Move            "Motion"
+	Lower           "Click"
+	RaiseLower      "DoubleClick"
+EndFunction
+
+Function "Resize-or-Raise"
+	Resize          "Motion"
+	Raise           "Motion"
+	Raise           "Click"
+	RaiseLower      "DoubleClick"
+EndFunction
+
+Function "Resize-or-Lower"
+	Resize          "Motion"
+	Lower           "Click"
+	RaiseLower      "DoubleClick"
+EndFunction
+
+#     Button	Context Modifi 	Function
+Mouse 1		R   	A       PopUp "Main menu"
+Mouse 2		R    	A      	PopUp "Window Ops"
+Mouse 3		R    	A      	WindowList
+
+#     Button	Context Modifi 	Function
+Mouse 0		1    	A      	Function "windowops-or-die"
+Mouse 0		2    	A     	Maximize
+Mouse 0		4    	A     	Iconify
+
+Mouse 1         FS      A       Function "Resize-or-Raise"
+Mouse 2         FS      A       Function "Resize-or-Lower"
+Mouse 1         T       A       Function "Move-or-Raise"
+Mouse 2         T       A       Function "Move-or-Lower"
+
+Mouse 1		I	A	Function "Move-or-Iconify"
+Mouse 2		I	A	Function "Move-or-Iconify"
+Mouse 3		I	A	PopUp 	 "Window-Ops2"
+Mouse 3		FST    	A      	Function "windowops-or-die"
+
+Key Left	A	C	Scroll -100 0
+Key Right	A	C	Scroll +100 +0
+Key Up		A	C	Scroll +0   -100
+Key Down	A	C	Scroll +0   +100
+
+Key Left	A	M	Scroll -10 +0
+Key Right	A	M	Scroll +10 +0
+Key Up		A	M	Scroll +0   -10
+Key Down	A	M	Scroll +0   +10
+
+Key Left	A	SC	CursorMove -1 0
+Key Right	A	SC	CursorMove +1 +0
+Key Up		A	SC	CursorMove +0   -1
+Key Down	A	SC	CursorMove +0   +1
+
+Key Left	A	SM	CursorMove -10 +0
+Key Right	A	SM	CursorMove +10 +0
+Key Up		A	SM	CursorMove +0   -10
+Key Down	A	SM	CursorMove +0   +10
+
+Key F1		A	M	Popup "Window Ops"
+Key F2		A	M	Popup "Main menu"
+Key F3		A	M	Lower
+Key F4		A	M	Destroy
+Key F5		A	M	CirculateUp
+Key F6		A	M	CirculateDown
+Key F7		A	M	Move
+Key F8		A	M	Resize
+Key F9		A	M	Iconify
+Key F10		A	M	Maximize
+
+Key L5                IW      N       RaiseLower
+Key L5                IW      S       Lower
+Key L5                IW      C       Raise
+Key L7                IW      A       Iconify
+
+
+*FvwmIdentBack MidnightBlue
+*FvwmIdentFore Yellow
+*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
+
+*FvwmWinListBack #908090
+*FvwmWinListFore Black
+*FvwmWinListFont -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
+*FvwmWinListUseSkipList
+*FvwmWinListGeometry +0-1
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.mwm.xinitrc xfce-3.2.2/debian/sample.mwm.xinitrc
--- xfce-3.2.1/debian/sample.mwm.xinitrc	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.mwm.xinitrc	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Start-up stuff from ~/Desktop/Autostart (as it seems to be the new standard)
+#
+for i in `ls ${HOME}/Desktop/Autostart/`; do
+  if test -x $HOME/Desktop/Autostart/$i; then
+     $HOME/Desktop/Autostart/$i &
+  fi
+done
+#
+# Start the window manager 
+#
+mwm&
+# Start "xfbd" for backdrop management
+xfbd&
+# Start "xfmouse" for userdefined mouse settings
+xfmouse&
+# And at last, start "xfce"
+xfce
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfbdrc xfce-3.2.2/debian/sample.xfbdrc
--- xfce-3.2.1/debian/sample.xfbdrc	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/debian/sample.xfbdrc	Fri Dec  3 21:16:47 1999
@@ -1 +1 @@
-/usr/share/xfce/backdrops/BlueStucco.xpm
+/usr/share/xfce/backdrops/GreenStucco.xpm
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfce3rc xfce-3.2.2/debian/sample.xfce3rc
--- xfce-3.2.1/debian/sample.xfce3rc	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/debian/sample.xfce3rc	Sat Dec  4 12:44:51 1999
@@ -1,7 +1,7 @@
 # XFce 3 Configuration File - Do not edit
 [Coords]
-	59
-	785
+	-1
+	-1
 [ButtonLabels]
 	One
 	Two
@@ -35,7 +35,7 @@
 	NoRepaint
 	Solid
 [Lock]
-	xlock -mode blank -echokeys -mousemotion
+	xflock
 [MenuOption]
 	Detach
 [XFwmOption]
@@ -43,25 +43,25 @@
 	OpaqueMove
 	OpaqueResize
 	10
-	6
+	31
 	NoAutoraise
 	OpaqueActive
-	OpaqueInactive
-	IconsOnRight
-	-adobe-helvetica-bold-r-normal-*-12-*-*-*-p-*-iso8859-1
-	-adobe-helvetica-bold-r-normal-*-12-*-*-*-p-*-iso8859-1
-	-adobe-helvetica-bold-r-normal-*-12-*-*-*-p-*-iso8859-1
+	GradientInactive
+	IconsOnTop
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
 [Screens]
 	4
 [Tooltips]
 	250
 [Sizes]
-	LargePanelIcons
-	MediumMenuIcons
+	SmallPanelIcons
+	SmallMenuIcons
 [Commands]
 	xftree
 	xcalc
-	xterm
+	xfterm
 	xfmouse -i
 	netscape
 	xfprint
@@ -71,7 +71,7 @@
 	xv
 	None
 	None
-	nedit
+	xwp
 [Menu1]
 	XFClock
 	/usr/share/xfce/icons/Clock.xpm
@@ -95,10 +95,16 @@
 	Debugger
 	/usr/share/xfce/icons/BulletHole.xpm
 	xxgdb
+	GNU Emacs
+	/usr/share/xfce/icons/Edit.xpm
+	emacs
+	GNOME Panel
+	/usr/share/xfce/icons/Gnome-panel.xpm
+	panel
 [Menu3]
 	X-Terminal
 	/usr/share/xfce/icons/CheckMarkMonitor.xpm
-	xterm
+	xfterm
 	X-Edit
 	/usr/share/xfce/icons/Document.xpm
 	xedit
@@ -118,6 +124,15 @@
 	Backdrop
 	/usr/share/xfce/icons/MaelstromInFrame.xpm
 	xfbd -i
+	XFGnome
+	/usr/share/xfce/icons/Gnome-logo.xpm
+	Module xfgnome
+	Gfx. Configuration
+	/usr/share/xfce/icons/BWwidgets.xpm
+	imlib_config
+	Screensaver Opt.
+	/usr/share/xfce/icons/Key.xpm
+	xscreensaver-demo
 [Menu5]
 	Netscape Browser
 	/usr/share/xfce/icons/Netscape3.xpm
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfce3rc.ja xfce-3.2.2/debian/sample.xfce3rc.ja
--- xfce-3.2.1/debian/sample.xfce3rc.ja	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xfce3rc.ja	Sat Dec  4 12:44:44 1999
@@ -0,0 +1,176 @@
+# XFce 3 Configuration File - Do not edit
+[Coords]
+	-1
+	-1
+[ButtonLabels]
+	One
+	Two
+	Three
+	Four
+	Five
+	Six
+	Seven
+	Eight
+	Nine
+	Ten
+[External_Icons]
+	/usr/share/xfce/icons/FolderDeposit.xpm
+	/usr/share/xfce/icons/BallotBox.xpm
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	/usr/share/xfce/icons/Interface.xpm
+	/usr/share/xfce/icons/NetscapeLogo.xpm
+	/usr/share/xfce/icons/Printer.xpm
+	/usr/share/xfce/icons/Info.xpm
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	None
+	/usr/share/xfce/icons/3dpaint.xpm
+	/usr/share/xfce/icons/TrueDie.xpm
+	None
+	None
+[Popups]
+	8
+[Icons]
+	99,99,99,4,99,99,99,99,8,99,99,11,7
+[WorkSpace]
+	NoRepaint
+	Solid
+[Lock]
+	xflock
+[MenuOption]
+	Detach
+[XFwmOption]
+	ClickToFocus
+	OpaqueMove
+	OpaqueResize
+	10
+	31
+	NoAutoraise
+	OpaqueActive
+	GradientInactive
+	IconsOnTop
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
+[Screens]
+	4
+[Tooltips]
+	250
+[Clock]
+	Digital
+	24hrs
+[Sizes]
+	SmallPanelIcons
+	SmallMenuIcons
+[Commands]
+	xftree
+	xcalc
+	xterm
+	xfmouse -i
+	netscape
+	xfprint
+	xfhelp
+	xftrash
+	None
+	xv
+	None
+	None
+	xwp
+[Menu1]
+	XFClock
+	/usr/share/xfce/icons/Clock.xpm
+	xfclock
+	XFTree
+	/usr/share/xfce/icons/FileManager.xpm
+	xftree
+[Menu2]
+	Calculator
+	/usr/share/xfce/icons/OldBlueAddingMachine.xpm
+	xcalc
+	Editres
+	/usr/share/xfce/icons/Editres.xpm
+	editres
+	System load
+	/usr/share/xfce/icons/CPUChip.xpm
+	xosview
+	Magnify
+	/usr/share/xfce/icons/MagnifyGlas.xpm
+	xmag
+	Debugger
+	/usr/share/xfce/icons/BulletHole.xpm
+	xxgdb
+	GNU Emacs
+	/usr/share/xfce/icons/Edit.xpm
+	emacs
+	GNOME Panel
+	/usr/share/xfce/icons/Gnome-panel.xpm
+	panel
+[Menu3]
+	X-Terminal
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	xterm
+	X-Edit
+	/usr/share/xfce/icons/Document.xpm
+	xedit
+	Vi
+	/usr/share/xfce/icons/Keys.xpm
+	Term vi
+	KTerm
+	/usr/share/pixmaps/kterm.xpm
+	kterm
+[Menu4]
+	XFPager
+	/usr/share/xfce/icons/RayTracedGear.xpm
+	Module xfpager
+	XFMouse
+	/usr/share/xfce/icons/Mouse.xpm
+	xfmouse -i
+	XFSound
+	/usr/share/xfce/icons/MicroPhonePro.xpm
+	xfsound -i
+	Backdrop
+	/usr/share/xfce/icons/MaelstromInFrame.xpm
+	xfbd -i
+	XFGnome
+	/usr/share/xfce/icons/Gnome-logo.xpm
+	Module xfgnome
+	Gfx. Configuration
+	/usr/share/xfce/icons/BWwidgets.xpm
+	imlib_config
+	Screensaver Opt.
+	/usr/share/xfce/icons/Key.xpm
+	xscreensaver-demo
+[Menu5]
+	Netscape Browser
+	/usr/share/xfce/icons/Netscape3.xpm
+	jnetscape
+	Netscape Mail
+	/usr/share/xfce/icons/News.xpm
+	netscape -mail
+[Menu6]
+	Printer
+	/usr/share/xfce/icons/Printer.xpm
+	xfprint
+[Menu7]
+	WordPerfect
+	/usr/share/xfce/icons/Pen.xpm
+	xwp
+	Nedit
+	/usr/share/xfce/icons/Book.xpm
+	nedit
+[Menu8]
+	Trash
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	xftrash
+[Menu9]
+[Menu10]
+	Gimp
+	/usr/share/xfce/icons/GIMP.xpm
+	gimp
+	XV
+	/usr/share/xfce/icons/XV.xpm
+	xv
+	X-Paint
+	/usr/share/xfce/icons/3dpaint.xpm
+	xpaint
+[Menu11]
+[Menu12]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfce3rc.ko xfce-3.2.2/debian/sample.xfce3rc.ko
--- xfce-3.2.1/debian/sample.xfce3rc.ko	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xfce3rc.ko	Sat Dec  4 12:44:36 1999
@@ -0,0 +1,170 @@
+# XFce 3 Configuration File - Do not edit
+[Coords]
+	-1
+	-1
+[ButtonLabels]
+	One
+	Two
+	Three
+	Four
+	Five
+	Six
+	Seven
+	Eight
+	Nine
+	Ten
+[External_Icons]
+	/usr/share/xfce/icons/FolderDeposit.xpm
+	/usr/share/xfce/icons/BallotBox.xpm
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	/usr/share/xfce/icons/Interface.xpm
+	/usr/share/xfce/icons/NetscapeLogo.xpm
+	/usr/share/xfce/icons/Printer.xpm
+	/usr/share/xfce/icons/Info.xpm
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	None
+	/usr/share/xfce/icons/3dpaint.xpm
+	/usr/share/xfce/icons/TrueDie.xpm
+	None
+	None
+[Popups]
+	8
+[Icons]
+	99,99,99,4,99,99,99,99,8,99,99,11,7
+[WorkSpace]
+	NoRepaint
+	Solid
+[Lock]
+	xflock
+[MenuOption]
+	Detach
+[XFwmOption]
+	ClickToFocus
+	OpaqueMove
+	OpaqueResize
+	10
+	31
+	NoAutoraise
+	OpaqueActive
+	GradientInactive
+	IconsOnTop
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
+[Screens]
+	4
+[Tooltips]
+	250
+[Sizes]
+	SmallPanelIcons
+	SmallMenuIcons
+[Commands]
+	xftree
+	xcalc
+	xfterm
+	xfmouse -i
+	netscape
+	xfprint
+	xfhelp
+	xftrash
+	None
+	xv
+	None
+	None
+	xwp
+[Menu1]
+	XFClock
+	/usr/share/xfce/icons/Clock.xpm
+	xfclock
+	XFTree
+	/usr/share/xfce/icons/FileManager.xpm
+	xftree
+[Menu2]
+	Calculator
+	/usr/share/xfce/icons/OldBlueAddingMachine.xpm
+	xcalc
+	Editres
+	/usr/share/xfce/icons/Editres.xpm
+	editres
+	System load
+	/usr/share/xfce/icons/CPUChip.xpm
+	xosview
+	Magnify
+	/usr/share/xfce/icons/MagnifyGlas.xpm
+	xmag
+	Debugger
+	/usr/share/xfce/icons/BulletHole.xpm
+	xxgdb
+	GNU Emacs
+	/usr/share/xfce/icons/Edit.xpm
+	emacs
+	GNOME Panel
+	/usr/share/xfce/icons/Gnome-panel.xpm
+	panel
+[Menu3]
+	X-Terminal
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	xfterm
+	X-Edit
+	/usr/share/xfce/icons/Document.xpm
+	xedit
+	Vi
+	/usr/share/xfce/icons/Keys.xpm
+	Term vi
+[Menu4]
+	XFPager
+	/usr/share/xfce/icons/RayTracedGear.xpm
+	Module xfpager
+	XFMouse
+	/usr/share/xfce/icons/Mouse.xpm
+	xfmouse -i
+	XFSound
+	/usr/share/xfce/icons/MicroPhonePro.xpm
+	xfsound -i
+	Backdrop
+	/usr/share/xfce/icons/MaelstromInFrame.xpm
+	xfbd -i
+	XFGnome
+	/usr/share/xfce/icons/Gnome-logo.xpm
+	Module xfgnome
+	Gfx. Configuration
+	/usr/share/xfce/icons/BWwidgets.xpm
+	imlib_config
+	Screensaver Opt.
+	/usr/share/xfce/icons/Key.xpm
+	xscreensaver-demo
+[Menu5]
+	Netscape Browser
+	/usr/share/xfce/icons/Netscape3.xpm
+	netscape
+	Netscape Mail
+	/usr/share/xfce/icons/News.xpm
+	netscape -mail
+[Menu6]
+	Printer
+	/usr/share/xfce/icons/Printer.xpm
+	xfprint
+[Menu7]
+	WordPerfect
+	/usr/share/xfce/icons/Pen.xpm
+	xwp
+	Nedit
+	/usr/share/xfce/icons/Book.xpm
+	nedit
+[Menu8]
+	Trash
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	xftrash
+[Menu9]
+[Menu10]
+	Gimp
+	/usr/share/xfce/icons/GIMP.xpm
+	gimp
+	XV
+	/usr/share/xfce/icons/XV.xpm
+	xv
+	X-Paint
+	/usr/share/xfce/icons/3dpaint.xpm
+	xpaint
+[Menu11]
+[Menu12]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfce3rc.zh_CN.GB2312 xfce-3.2.2/debian/sample.xfce3rc.zh_CN.GB2312
--- xfce-3.2.1/debian/sample.xfce3rc.zh_CN.GB2312	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xfce3rc.zh_CN.GB2312	Sat Dec  4 12:44:29 1999
@@ -0,0 +1,170 @@
+# XFce 3 Configuration File - Do not edit
+[Coords]
+	-1
+	-1
+[ButtonLabels]
+	One
+	Two
+	Three
+	Four
+	Five
+	Six
+	Seven
+	Eight
+	Nine
+	Ten
+[External_Icons]
+	/usr/share/xfce/icons/FolderDeposit.xpm
+	/usr/share/xfce/icons/BallotBox.xpm
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	/usr/share/xfce/icons/Interface.xpm
+	/usr/share/xfce/icons/NetscapeLogo.xpm
+	/usr/share/xfce/icons/Printer.xpm
+	/usr/share/xfce/icons/Info.xpm
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	None
+	/usr/share/xfce/icons/3dpaint.xpm
+	/usr/share/xfce/icons/TrueDie.xpm
+	None
+	None
+[Popups]
+	8
+[Icons]
+	99,99,99,4,99,99,99,99,8,99,99,11,7
+[WorkSpace]
+	NoRepaint
+	Solid
+[Lock]
+	xflock
+[MenuOption]
+	Detach
+[XFwmOption]
+	ClickToFocus
+	OpaqueMove
+	OpaqueResize
+	10
+	31
+	NoAutoraise
+	OpaqueActive
+	GradientInactive
+	IconsOnTop
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
+[Screens]
+	4
+[Tooltips]
+	250
+[Sizes]
+	SmallPanelIcons
+	SmallMenuIcons
+[Commands]
+	xftree
+	xcalc
+	xfterm
+	xfmouse -i
+	netscape
+	xfprint
+	xfhelp
+	xftrash
+	None
+	xv
+	None
+	None
+	xwp
+[Menu1]
+	XFClock
+	/usr/share/xfce/icons/Clock.xpm
+	xfclock
+	XFTree
+	/usr/share/xfce/icons/FileManager.xpm
+	xftree
+[Menu2]
+	Calculator
+	/usr/share/xfce/icons/OldBlueAddingMachine.xpm
+	xcalc
+	Editres
+	/usr/share/xfce/icons/Editres.xpm
+	editres
+	System load
+	/usr/share/xfce/icons/CPUChip.xpm
+	xosview
+	Magnify
+	/usr/share/xfce/icons/MagnifyGlas.xpm
+	xmag
+	Debugger
+	/usr/share/xfce/icons/BulletHole.xpm
+	xxgdb
+	GNU Emacs
+	/usr/share/xfce/icons/Edit.xpm
+	emacs
+	GNOME Panel
+	/usr/share/xfce/icons/Gnome-panel.xpm
+	panel
+[Menu3]
+	X-Terminal
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	xfterm
+	X-Edit
+	/usr/share/xfce/icons/Document.xpm
+	xedit
+	Vi
+	/usr/share/xfce/icons/Keys.xpm
+	Term vi
+[Menu4]
+	XFPager
+	/usr/share/xfce/icons/RayTracedGear.xpm
+	Module xfpager
+	XFMouse
+	/usr/share/xfce/icons/Mouse.xpm
+	xfmouse -i
+	XFSound
+	/usr/share/xfce/icons/MicroPhonePro.xpm
+	xfsound -i
+	Backdrop
+	/usr/share/xfce/icons/MaelstromInFrame.xpm
+	xfbd -i
+	XFGnome
+	/usr/share/xfce/icons/Gnome-logo.xpm
+	Module xfgnome
+	Gfx. Configuration
+	/usr/share/xfce/icons/BWwidgets.xpm
+	imlib_config
+	Screensaver Opt.
+	/usr/share/xfce/icons/Key.xpm
+	xscreensaver-demo
+[Menu5]
+	Netscape Browser
+	/usr/share/xfce/icons/Netscape3.xpm
+	netscape
+	Netscape Mail
+	/usr/share/xfce/icons/News.xpm
+	netscape -mail
+[Menu6]
+	Printer
+	/usr/share/xfce/icons/Printer.xpm
+	xfprint
+[Menu7]
+	WordPerfect
+	/usr/share/xfce/icons/Pen.xpm
+	xwp
+	Nedit
+	/usr/share/xfce/icons/Book.xpm
+	nedit
+[Menu8]
+	Trash
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	xftrash
+[Menu9]
+[Menu10]
+	Gimp
+	/usr/share/xfce/icons/GIMP.xpm
+	gimp
+	XV
+	/usr/share/xfce/icons/XV.xpm
+	xv
+	X-Paint
+	/usr/share/xfce/icons/3dpaint.xpm
+	xpaint
+[Menu11]
+[Menu12]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfce3rc.zh_TW.Big5 xfce-3.2.2/debian/sample.xfce3rc.zh_TW.Big5
--- xfce-3.2.1/debian/sample.xfce3rc.zh_TW.Big5	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xfce3rc.zh_TW.Big5	Sat Dec  4 12:44:22 1999
@@ -0,0 +1,170 @@
+# XFce 3 Configuration File - Do not edit
+[Coords]
+	-1
+	-1
+[ButtonLabels]
+	One
+	Two
+	Three
+	Four
+	Five
+	Six
+	Seven
+	Eight
+	Nine
+	Ten
+[External_Icons]
+	/usr/share/xfce/icons/FolderDeposit.xpm
+	/usr/share/xfce/icons/BallotBox.xpm
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	/usr/share/xfce/icons/Interface.xpm
+	/usr/share/xfce/icons/NetscapeLogo.xpm
+	/usr/share/xfce/icons/Printer.xpm
+	/usr/share/xfce/icons/Info.xpm
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	None
+	/usr/share/xfce/icons/3dpaint.xpm
+	/usr/share/xfce/icons/TrueDie.xpm
+	None
+	None
+[Popups]
+	8
+[Icons]
+	99,99,99,4,99,99,99,99,8,99,99,11,7
+[WorkSpace]
+	NoRepaint
+	Solid
+[Lock]
+	xflock
+[MenuOption]
+	Detach
+[XFwmOption]
+	ClickToFocus
+	OpaqueMove
+	OpaqueResize
+	10
+	31
+	NoAutoraise
+	OpaqueActive
+	GradientInactive
+	IconsOnTop
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
+[Screens]
+	4
+[Tooltips]
+	250
+[Sizes]
+	SmallPanelIcons
+	SmallMenuIcons
+[Commands]
+	xftree
+	xcalc
+	xfterm
+	xfmouse -i
+	netscape
+	xfprint
+	xfhelp
+	xftrash
+	None
+	xv
+	None
+	None
+	xwp
+[Menu1]
+	XFClock
+	/usr/share/xfce/icons/Clock.xpm
+	xfclock
+	XFTree
+	/usr/share/xfce/icons/FileManager.xpm
+	xftree
+[Menu2]
+	Calculator
+	/usr/share/xfce/icons/OldBlueAddingMachine.xpm
+	xcalc
+	Editres
+	/usr/share/xfce/icons/Editres.xpm
+	editres
+	System load
+	/usr/share/xfce/icons/CPUChip.xpm
+	xosview
+	Magnify
+	/usr/share/xfce/icons/MagnifyGlas.xpm
+	xmag
+	Debugger
+	/usr/share/xfce/icons/BulletHole.xpm
+	xxgdb
+	GNU Emacs
+	/usr/share/xfce/icons/Edit.xpm
+	emacs
+	GNOME Panel
+	/usr/share/xfce/icons/Gnome-panel.xpm
+	panel
+[Menu3]
+	X-Terminal
+	/usr/share/xfce/icons/CheckMarkMonitor.xpm
+	xfterm
+	X-Edit
+	/usr/share/xfce/icons/Document.xpm
+	xedit
+	Vi
+	/usr/share/xfce/icons/Keys.xpm
+	Term vi
+[Menu4]
+	XFPager
+	/usr/share/xfce/icons/RayTracedGear.xpm
+	Module xfpager
+	XFMouse
+	/usr/share/xfce/icons/Mouse.xpm
+	xfmouse -i
+	XFSound
+	/usr/share/xfce/icons/MicroPhonePro.xpm
+	xfsound -i
+	Backdrop
+	/usr/share/xfce/icons/MaelstromInFrame.xpm
+	xfbd -i
+	XFGnome
+	/usr/share/xfce/icons/Gnome-logo.xpm
+	Module xfgnome
+	Gfx. Configuration
+	/usr/share/xfce/icons/BWwidgets.xpm
+	imlib_config
+	Screensaver Opt.
+	/usr/share/xfce/icons/Key.xpm
+	xscreensaver-demo
+[Menu5]
+	Netscape Browser
+	/usr/share/xfce/icons/Netscape3.xpm
+	netscape
+	Netscape Mail
+	/usr/share/xfce/icons/News.xpm
+	netscape -mail
+[Menu6]
+	Printer
+	/usr/share/xfce/icons/Printer.xpm
+	xfprint
+[Menu7]
+	WordPerfect
+	/usr/share/xfce/icons/Pen.xpm
+	xwp
+	Nedit
+	/usr/share/xfce/icons/Book.xpm
+	nedit
+[Menu8]
+	Trash
+	/usr/share/xfce/icons/RecycleLogo.xpm
+	xftrash
+[Menu9]
+[Menu10]
+	Gimp
+	/usr/share/xfce/icons/GIMP.xpm
+	gimp
+	XV
+	/usr/share/xfce/icons/XV.xpm
+	xv
+	X-Paint
+	/usr/share/xfce/icons/3dpaint.xpm
+	xpaint
+[Menu11]
+[Menu12]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xfwmrc xfce-3.2.2/debian/sample.xfwmrc
--- xfce-3.2.1/debian/sample.xfwmrc	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xfwmrc	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,115 @@
+MenuFont            -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
+WindowFont          -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
+IconFont            -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*
+
+AnimateWin          On
+ColormapFocus       FollowsFocus
+FocusMode           ClickToFocus
+AutoRaise           Off
+AutoRaiseDelay      250
+
+Style "*"           BorderWidth 6
+Style "XFce*"	    Sticky
+# Style "XFce*"       StaysOnTop
+Style "XFbd*"       Sticky 
+Style "Popup*"      Sticky
+Style "Alert*"	    Sticky, StaysOnTop
+Style "Question*"   Sticky, StaysOnTop
+Style "Message*"    Sticky, StaysOnTop
+Style "*Pager"	    Sticky
+Style "*lock"       Sticky
+
+# Default icons for most common apps
+
+Style "*term*"      icon "/usr/share/xfce/icons/CheckMarkMonitor.xpm"
+Style "Term*"       icon "/usr/share/xfce/icons/CheckMarkMonitor.xpm"
+Style "rxvt*"       icon "/usr/share/xfce/icons/CheckMarkMonitor.xpm"
+Style "*mag*"       icon "/usr/share/xfce/icons/MagnifyGlas.xpm"
+Style "xosview*"    icon "/usr/share/xfce/icons/CPUChip.xpm"
+Style "editres*"    icon "/usr/share/xfce/icons/Editres.xpm"
+Style "*calc*"      icon "/usr/share/xfce/icons/OldBlueAddingMachine.xpm"
+Style "*GIMP*"      icon "/usr/share/xfce/icons/Gimp2.xpm"
+Style "*paint*"     icon "/usr/share/xfce/icons/3dpaint.xpm"
+Style "*game*"      icon "/usr/share/xfce/icons/TrueDie.xpm"
+Style "*.jpg*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.gif*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.png*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.bmp*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.xpm*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.xwd*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.JPG*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.GIF*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.PNG*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.BMP*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.XPM*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "*.XWD*"      icon "/usr/share/xfce/icons/Monalisa.xpm"
+Style "XMMS*"       icon "/usr/share/xfce/icons/CDPlayer.xpm"
+Style "*gnome*"     icon "/usr/share/xfce/icons/Gnome-apps.xpm"
+Style "*Gnome*"     icon "/usr/share/xfce/icons/Gnome-apps.xpm"
+Style "*GNOME*"     icon "/usr/share/xfce/icons/Gnome-apps.xpm"
+
+# Common init and restart functions
+#AddToFunc "InitFunction"
+#+ "I" Module xfpager
+#+ "I" Exec xterm
+#AddToFunc "RestartFunction"
+#+ "I" Module xfpager
+#+ "I" Exec xterm
+
+# Adding a user menu to the default root menu :
+# (This is just a sample, modify it to fit your need)
+# Uncomment the following lines to create a user menu
+#
+#AddToMenu "user_menu"
+#+ "&Gnome Terminal" Exec gnome-terminal
+#+ "" Nop
+#+ "&The GIMP" Exec gimp
+#
+# Menu "__builtin_root_menu__" is the name of the default root menu
+#
+#AddToMenu "__builtin_root_menu__"
+#+ "&User menu" popup "user_menu
+
+# Uncomment the following if you want tot remove default keyboard shortcuts
+# (Some applications require this, as they use the same shortcuts)
+#Key Tab A M -
+#Key Escape A S -
+#Key Escape A C -
+#Key Left A SC -
+#Key Right A SC -
+#Key Up A SC -
+#Key Down A SC  -
+#Key Left A SM  -
+#Key Right A SM  -
+#Key Up A SM  -
+#Key Down A SM  -
+#Key F1 A M -
+#Key F2 A M -
+#Key F3 A M -
+#Key F4 A M -
+#Key F5 A M -
+#Key F6 A M -
+#Key F7 A M -
+#Key F8 A M -
+#Key F9 A M -
+#Key F10 A M -
+#Key F11 A M -
+#Key F1 A C -
+#Key F2 A C -
+#Key F3 A C -
+#Key F4 A C -
+#Key F5 A C -
+#Key F6 A C -
+#Key F7 A C -
+#Key F8 A C -
+#Key F9 A C -
+#Key F10 A  C -
+#Key L5 IW N -
+#Key L5 IW S -
+#Key L5 IW C -
+#Key L7 IW A -
+
+# Options for xfpager :
+
+*xfpager.geometry -0+0
+*xfpager.smallfont 5x8
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xinitrc xfce-3.2.2/debian/sample.xinitrc
--- xfce-3.2.1/debian/sample.xinitrc	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xinitrc	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+#
+# Start-up stuff from ~/Desktop/Autostart (as it seems to be the new standard)
+#
+for i in `ls ${HOME}/Desktop/Autostart/`; do
+  if test -x $HOME/Desktop/Autostart/$i; then
+     $HOME/Desktop/Autostart/$i &
+  fi
+done
+#
+# launch xscreensaver (if available)
+#
+xscreensaver  -no-splash -lock-mode &
+#
+# And launch XFce window manager
+#
+exec xfwm
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xsession xfce-3.2.2/debian/sample.xsession
--- xfce-3.2.1/debian/sample.xsession	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xsession	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+rm -f /tmp/Xrootenv.0
+rm -f /tmp/fvwmrc*
+
+if [ -f $HOME/.xinitrc ]; then
+	env > /tmp/Xrootenv.0
+	/bin/sh $HOME/.xinitrc
+	exit
+fi
+
+if [ -f $HOME/.fvwm2rc.m4 ]; then
+	RCFILE=$HOME/.fvwm2rc.m4
+else
+	RCFILE=/etc/X11/TheNextLevel/.fvwm2rc.m4
+fi
+
+if [ ! -z $(type -path fvwm95-2) ]; then
+	env > /tmp/Xrootenv.0
+	exec fvwm95-2 -f "FvwmM4 -debug $RCFILE" -display :0 \
+		> $HOME/.FVWM95-errors 2>&1
+fi
+
+if [ ! -z $(type -path fvwm2) ]; then
+	env > /tmp/Xrootenv.0
+	exec fvwm2 -f "FvwmM4 -debug $RCFILE" -display :0 \
+		> $HOME/.FVWM2-errors 2>&1
+fi
+
+if [ ! -z $(type -path fvwm) ]; then
+	exec fvwm
+fi
+
+# last resort
+
+xterm &
+exec twm
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/debian/sample.xtree.reg xfce-3.2.2/debian/sample.xtree.reg
--- xfce-3.2.1/debian/sample.xtree.reg	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/debian/sample.xtree.reg	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,22 @@
+# (suffix) (program) (args)
+(.as) (applix) ()
+(.aw) (applix) ()
+(.bmp) (xv) ()
+(.c) (xedit) ()
+(.cc) (xedit) ()
+(.cpp) (xedit) ()
+(.gif) (xv) ()
+(.h) (xedit) ()
+(.html) (netscape) ()
+(.htm) (netscape) ()
+(.jpg) (xv) ()
+(.jpeg) (xv) ()
+(.lsm) (xedit) ()
+(.png) (xv) ()
+(.ps) (gv) ()
+(.wav) (xfplay) ()
+(.wpd) (xwp) ()
+(.xbm) (xv) ()
+(.xpm) (xv) ()
+(README) (xedit) ()
+(core) (xterm) (-e gdb -c)
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/libs/Makefile.in xfce-3.2.2/libs/Makefile.in
--- xfce-3.2.1/libs/Makefile.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/libs/Makefile.in	Sat Dec  4 10:19:38 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -143,7 +144,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libxfce_a_SOURCES) $(libxfwm_a_SOURCES)
 OBJECTS = $(libxfce_a_OBJECTS) $(libxfwm_a_OBJECTS)
@@ -234,7 +235,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -263,7 +264,7 @@
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/libs/constant.h xfce-3.2.2/libs/constant.h
--- xfce-3.2.1/libs/constant.h	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/libs/constant.h	Fri Dec  3 21:16:47 1999
@@ -41,7 +41,7 @@
 #define MENU_CURS    XC_right_ptr
 
 #ifndef DEFAULTFONT
-#define DEFAULTFONT 	"-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*"
+#define DEFAULTFONT 	"-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*"
 #endif
 
 #ifndef TIPFONT
@@ -118,7 +118,7 @@
 #endif
 
 #ifndef TERMINAL
-#define TERMINAL "xfterm"
+#define TERMINAL "xterm"
 #endif
 
 #ifndef MAILCHECK_PERIOD
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/other/sample.xfce3rc.in xfce-3.2.2/other/sample.xfce3rc.in
--- xfce-3.2.1/other/sample.xfce3rc.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/other/sample.xfce3rc.in	Sat Dec  4 12:43:52 1999
@@ -35,7 +35,7 @@
 	NoRepaint
 	Solid
 [Lock]
-	xscreensaver-command -lock
+	xflock
 [MenuOption]
 	Detach
 [XFwmOption]
@@ -43,14 +43,14 @@
 	OpaqueMove
 	OpaqueResize
 	10
-	15
+	31
 	NoAutoraise
 	OpaqueActive
 	GradientInactive
 	IconsOnTop
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
 [Screens]
 	4
 [Tooltips]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/other/sample.xfce3rc.ja.in xfce-3.2.2/other/sample.xfce3rc.ja.in
--- xfce-3.2.1/other/sample.xfce3rc.ja.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/other/sample.xfce3rc.ja.in	Sat Dec  4 12:43:44 1999
@@ -35,7 +35,7 @@
 	NoRepaint
 	Solid
 [Lock]
-	xscreensaver-command -lock
+	xflock
 [MenuOption]
 	Detach
 [XFwmOption]
@@ -43,14 +43,14 @@
 	OpaqueMove
 	OpaqueResize
 	10
-	15
+	31
 	NoAutoraise
 	OpaqueActive
 	GradientInactive
 	IconsOnTop
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-jisx0208.1983-0
 [Screens]
 	4
 [Tooltips]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/other/sample.xfce3rc.ko.in xfce-3.2.2/other/sample.xfce3rc.ko.in
--- xfce-3.2.1/other/sample.xfce3rc.ko.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/other/sample.xfce3rc.ko.in	Sat Dec  4 12:43:36 1999
@@ -35,7 +35,7 @@
 	NoRepaint
 	Solid
 [Lock]
-	xscreensaver-command -lock
+	xflock
 [MenuOption]
 	Detach
 [XFwmOption]
@@ -43,14 +43,14 @@
 	OpaqueMove
 	OpaqueResize
 	10
-	15
+	31
 	NoAutoraise
 	OpaqueActive
 	GradientInactive
 	IconsOnTop
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-ksc5601.1987-0
 [Screens]
 	4
 [Tooltips]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/other/sample.xfce3rc.zh_CN.GB2312.in xfce-3.2.2/other/sample.xfce3rc.zh_CN.GB2312.in
--- xfce-3.2.1/other/sample.xfce3rc.zh_CN.GB2312.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/other/sample.xfce3rc.zh_CN.GB2312.in	Sat Dec  4 12:43:28 1999
@@ -35,7 +35,7 @@
 	NoRepaint
 	Solid
 [Lock]
-	xscreensaver-command -lock
+	xflock
 [MenuOption]
 	Detach
 [XFwmOption]
@@ -43,14 +43,14 @@
 	OpaqueMove
 	OpaqueResize
 	10
-	15
+	31
 	NoAutoraise
 	OpaqueActive
 	GradientInactive
 	IconsOnTop
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-gb2312.1980-0
 [Screens]
 	4
 [Tooltips]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/other/sample.xfce3rc.zh_TW.Big5.in xfce-3.2.2/other/sample.xfce3rc.zh_TW.Big5.in
--- xfce-3.2.1/other/sample.xfce3rc.zh_TW.Big5.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/other/sample.xfce3rc.zh_TW.Big5.in	Sat Dec  4 12:43:19 1999
@@ -35,7 +35,7 @@
 	NoRepaint
 	Solid
 [Lock]
-	xscreensaver-command -lock
+	xflock
 [MenuOption]
 	Detach
 [XFwmOption]
@@ -43,14 +43,14 @@
 	OpaqueMove
 	OpaqueResize
 	10
-	15
+	31
 	NoAutoraise
 	OpaqueActive
 	GradientInactive
 	IconsOnTop
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
-	-*-lucidabright-demibold-r-*-*-12-*-75-75-*-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
+	-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*,-*-*-medium-r-normal--16-*-*-*-c-*-big5-0
 [Screens]
 	4
 [Tooltips]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/other/xfdefs.py xfce-3.2.2/other/xfdefs.py
--- xfce-3.2.1/other/xfdefs.py	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/other/xfdefs.py	Fri Dec  3 22:44:01 1999
@@ -16,7 +16,7 @@
 	   [], \
 	   ['*background', '*Background', 'OpenWindows*WindowColor', \
 	    'Window.Color.Background', 'XTerm*background', \
-	    'Rxvt*background', 'netscape*background', 'Netscape*background', \
+	    'netscape*background', 'Netscape*background', \
 	    '.netscape*background', 'Ddd*background', \
 	    'Emacs*Background', 'Emacs*backgroundToolBarColor'] \
 	   )
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/palettes/Symbiose xfce-3.2.2/palettes/Symbiose
--- xfce-3.2.1/palettes/Symbiose	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/palettes/Symbiose	Fri Dec  3 21:16:47 1999
@@ -6,4 +6,4 @@
 73 146 167
 0 114 168
 213 204 187
--b&h-lucidabright-demibold-r-normal-*-12-*-*-*-p-*-iso8859-1
+-*-new century schoolbook-medium-r-normal-*-12-*-*-*-p-*-*-*
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/po/xfce.pot xfce-3.2.2/po/xfce.pot
--- xfce-3.2.1/po/xfce.pot	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/po/xfce.pot	Sat Dec  4 12:54:17 1999
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-24 22:02+0100\n"
+"POT-Creation-Date: 1999-12-04 12:54+0100\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"
@@ -47,7 +47,7 @@
 msgid "Question"
 msgstr ""
 
-#: libs/xfce-common.c:622 xfwm/xfwm.c:1041
+#: libs/xfce-common.c:622 xfwm/xfwm.c:1042
 msgid "Terminated: "
 msgstr ""
 
@@ -122,46 +122,46 @@
 "Aborting"
 msgstr ""
 
-#: xfce/configfile.c:166 xfclock/xfclock_config.c:112
+#: xfce/configfile.c:167 xfclock/xfclock_config.c:112
 msgid "Cannot create file"
 msgstr ""
 
-#: xfce/configfile.c:287
+#: xfce/configfile.c:288
 msgid "Cannot reset configuration file"
 msgstr ""
 
-#: xfce/configfile.c:290
+#: xfce/configfile.c:291
 msgid "Creating new config file...\n"
 msgstr ""
 
-#: xfce/configfile.c:437 xfce/configfile.c:447 xfce/configfile.c:458
+#: xfce/configfile.c:438 xfce/configfile.c:448 xfce/configfile.c:459
 #, c-format
 msgid "XFce : %s File not found.\n"
 msgstr ""
 
-#: xfce/configfile.c:457 xfce/configfile.c:466
+#: xfce/configfile.c:458 xfce/configfile.c:467
 msgid "Cannot open configuration file"
 msgstr ""
 
-#: xfce/configfile.c:471
+#: xfce/configfile.c:472
 msgid "Does not looks like an XFce 3 configuration file !"
 msgstr ""
 
-#: xfce/configfile.c:472
+#: xfce/configfile.c:473
 msgid ""
 "Do you want to reset the configuration file ?\n"
 " \t(The previous file will be saved with \".orig\" extension)"
 msgstr ""
 
-#: xfce/configfile.c:482
+#: xfce/configfile.c:483
 msgid "Cannot open new config, Giving up..."
 msgstr ""
 
-#: xfce/configfile.c:483
+#: xfce/configfile.c:484
 msgid "Cannot load configuration file"
 msgstr ""
 
-#: xfce/configfile.c:489
+#: xfce/configfile.c:490
 msgid "Cannot use old version of XFce configuration files"
 msgstr ""
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/scripts/Makefile.am xfce-3.2.2/scripts/Makefile.am
--- xfce-3.2.1/scripts/Makefile.am	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/scripts/Makefile.am	Sat Dec  4 10:15:23 1999
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_SCRIPTS  = xfhelp xfprint xftrash xfterm xfce_setup xfce_remove startxfce
+bin_SCRIPTS  = xfhelp xfprint xftrash xfterm xflock xfce_setup xfce_remove startxfce
 
-man_MANS=xfhelp.1 xfprint.1 xftrash.1 xfterm.1
+man_MANS=xfhelp.1 xfprint.1 xftrash.1 xfterm.1 xflock.1
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/scripts/Makefile.in xfce-3.2.2/scripts/Makefile.in
--- xfce-3.2.1/scripts/Makefile.in	Fri Dec  3 22:22:39 1999
+++ xfce-3.2.2/scripts/Makefile.in	Sat Dec  4 10:19:44 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -100,9 +101,9 @@
 XFCE_LOCALE_DIR = @XFCE_LOCALE_DIR@
 l = @l@
 
-bin_SCRIPTS = xfhelp xfprint xftrash xfterm xfce_setup xfce_remove startxfce
+bin_SCRIPTS = xfhelp xfprint xftrash xfterm xflock xfce_setup xfce_remove startxfce
 
-man_MANS = xfhelp.1 xfprint.1 xftrash.1 xfterm.1
+man_MANS = xfhelp.1 xfprint.1 xftrash.1 xfterm.1 xflock.1
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -117,7 +118,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -198,7 +199,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -227,7 +228,7 @@
 all-am: Makefile $(SCRIPTS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/scripts/xflock xfce-3.2.2/scripts/xflock
--- xfce-3.2.1/scripts/xflock	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/scripts/xflock	Sat Dec  4 10:14:40 1999
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+#  gxfce
+#
+#  Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org)
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+xscreensaver-command -lock || xlock $*
+exit 0
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/scripts/xflock.1 xfce-3.2.2/scripts/xflock.1
--- xfce-3.2.1/scripts/xflock.1	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/scripts/xflock.1	Sat Dec  4 10:14:40 1999
@@ -0,0 +1,23 @@
+.\" SCCS ID: xflock.1 3.2.2 04/12/1999
+.TH xfce 1F "Olivier Fourdan"
+.SH NAME
+xflock \- small script to be used as drag and drop action for 
+"The Cholesterol Free Desktop Environment"
+.SH SYNOPSYS
+.B xflock
+[file]
+.PP
+.BI [args]
+.PP
+lock current screen using xscreensaver if available or xlock as fallback.
+.PP
+.SH DESCRIPTION
+xflock is a minimalist script to be used to lock the screen for the XFce
+front panel.
+.PP
+.SH SEE ALSO
+xfce, xftree, xfwm, xfpager, xfsound, xftrah, xfbd, xfclock
+.PP
+.SH AUTHOR
+Olivier Fourdan (fourdan@xfce.org)
+.PP
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/scripts/xfterm xfce-3.2.2/scripts/xfterm
--- xfce-3.2.1/scripts/xfterm	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/scripts/xfterm	Fri Dec  3 21:16:47 1999
@@ -35,7 +35,11 @@
                 if [ -x "$1" ]; then
                         exec $TERMCMD -e "$1"
                 else
-                        exec $TERMCMD -title "Viewing: $1" -e more "$1"
+                       if [ -f "$1" ]; then
+                               exec $TERMCMD -title "Viewing: $1" -e "more '$1'"
+                       else
+                               exec $TERMCMD $*
+                       fi
                 fi
         fi
 fi
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfbd/Makefile.in xfce-3.2.2/xfbd/Makefile.in
--- xfce-3.2.1/xfbd/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfbd/Makefile.in	Sat Dec  4 10:19:42 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -145,7 +146,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfbd_SOURCES)
 OBJECTS = $(xfbd_OBJECTS)
@@ -175,8 +176,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -285,7 +286,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -314,7 +315,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce/Makefile.in xfce-3.2.2/xfce/Makefile.in
--- xfce-3.2.1/xfce/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfce/Makefile.in	Sat Dec  4 10:19:39 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -147,7 +148,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfce_SOURCES)
 OBJECTS = $(xfce_OBJECTS)
@@ -177,8 +178,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -287,7 +288,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -316,7 +317,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce/configfile.c xfce-3.2.2/xfce/configfile.c
--- xfce-3.2.1/xfce/configfile.c	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/xfce/configfile.c	Sat Dec  4 12:46:08 1999
@@ -94,7 +94,8 @@
    newconf->snapsize = 10;
    newconf->autoraise = 0;
    newconf->tooltipsdelay = 250;
-   newconf->startup_flags = (F_SOUNDMODULE | F_MOUSEMODULE | F_BACKDROPMODULE | F_PAGERMODULE);
+   newconf->startup_flags = (F_SOUNDMODULE | F_MOUSEMODULE  |
+   			     F_BACKDROPMODULE | F_PAGERMODULE | F_GNOMEMODULE);
    newconf->iconpos = 0; /* Top of screen */
    newconf->fonts[0] = (char *) malloc (sizeof(char) * MAXSTRLEN);
    newconf->fonts[1] = (char *) malloc (sizeof(char) * MAXSTRLEN);
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce/system.xfce3rc xfce-3.2.2/xfce/system.xfce3rc
--- xfce-3.2.1/xfce/system.xfce3rc	Sun Nov 14 11:46:58 1999
+++ xfce-3.2.2/xfce/system.xfce3rc	Sat Dec  4 12:47:40 1999
@@ -1,144 +0,0 @@
-# XFce 3 Configuration File - Do not edit
-[Coords]
-	-1
-	-1
-[ButtonLabels]
-	One
-	Two
-	Three
-	Four
-	Five
-	Six
-	Seven
-	Eight
-	Nine
-	Ten
-[External_Icons]
-	None
-	None
-	/usr/share/xfce/icons/Penguin.xpm
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-[Popups]
-	6
-[Icons]
-	0,5,99,4,2,3,6,9,8,9,10,11,7
-[WorkSpace]
-	NoRepaint
-	Solid
-[Lock]
-	xlock -mode blank -echokeys -mousemotion
-[MenuOption]
-	Detach
-[XFwmOption]
-	ClickToFocus
-	OpaqueMove
-	NoAutoraise
-	GradientActive
-	GradientInactive
-	IconsOnTop
-	-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1
-	-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1
-	-b&h-lucida-medium-r-normal-*-10-*-*-*-p-*-iso8859-1
-[Screens]
-	4
-[Sizes]
-	MediumPanelIcons
-	MediumMenuIcons
-[Commands]
-	xftree
-	xcalc
-	xterm
-	xfmouse -i
-	netscape -mail
-	xlpq
-	xfhelp
-	xv
-	None
-	None
-	None
-	None
-	xwp
-[Menu1]
-	XFClock
-	/usr/share/xfce/icons/Clock.xpm
-	xfclock
-	XFTree
-	/usr/share/xfce/icons/Disk_blue.xpm
-	xftree
-[Menu2]
-	Calculator
-	/usr/share/xfce/icons/Calculator.xpm
-	xcalc
-	Editres
-	/usr/share/xfce/icons/Editres.xpm
-	editres
-	System load
-	/usr/share/xfce/icons/Meter.xpm
-	xosview
-	Magnify
-	/usr/share/xfce/icons/Magnify.xpm
-	xmag
-[Menu3]
-	X-Terminal
-	/usr/share/xfce/icons/Xterm.xpm
-	xterm
-	X-Edit
-	/usr/share/xfce/icons/TextEditor.xpm
-	xedit
-[Menu4]
-	XFPager
-	/usr/share/xfce/icons/Drawing3.xpm
-	Module xfpager
-	XFMouse
-	/usr/share/xfce/icons/Mouse.xpm
-	xfmouse -i
-	XFSound
-	/usr/share/xfce/icons/Sound.xpm
-	xfsound -i
-	Backdrop
-	/usr/share/xfce/icons/Palette.xpm
-	xfbd -i
-[Menu5]
-	Netscape Browser
-	/usr/share/xfce/icons/Netscape.xpm
-	netscape
-	Netscape Mail
-	/usr/share/xfce/icons/Mail.xpm
-	netscape - mail
-[Menu6]
-	Printer
-	/usr/share/xfce/icons/ABC.xpm
-	xlpq
-[Menu7]
-	WordPerfect
-	/usr/share/xfce/icons/WordProcessing2.xpm
-	xwp
-	GNotepad+
-	/usr/share/xfce/icons/Edit.xpm
-	gnp
-	Nedit
-	/usr/share/xfce/icons/Reader.xpm
-	nedit
-[Menu8]
-	Gimp
-	/usr/share/xfce/icons/Colormap.xpm
-	gimp
-	XV
-	/usr/share/xfce/icons/Xv.xpm
-	xv
-	X-Paint
-	/usr/share/xfce/icons/Drawing.xpm
-	xpaint
-[Menu9]
-[Menu10]
-[Menu11]
-[Menu12]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce/system.xfce3rc.in xfce-3.2.2/xfce/system.xfce3rc.in
--- xfce-3.2.1/xfce/system.xfce3rc.in	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/xfce/system.xfce3rc.in	Thu Jan  1 01:00:00 1970
@@ -1,144 +0,0 @@
-# XFce 3 Configuration File - Do not edit
-[Coords]
-	-1
-	-1
-[ButtonLabels]
-	One
-	Two
-	Three
-	Four
-	Five
-	Six
-	Seven
-	Eight
-	Nine
-	Ten
-[External_Icons]
-	None
-	None
-	XFCE_DIR/icons/Penguin.xpm
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-	None
-[Popups]
-	6
-[Icons]
-	0,5,99,4,2,3,6,9,8,9,10,11,7
-[WorkSpace]
-	NoRepaint
-	Solid
-[Lock]
-	xlock -mode blank -echokeys -mousemotion
-[MenuOption]
-	Detach
-[XFwmOption]
-	ClickToFocus
-	OpaqueMove
-	NoAutoraise
-	GradientActive
-	GradientInactive
-	IconsOnTop
-	-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1
-	-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1
-	-b&h-lucida-medium-r-normal-*-10-*-*-*-p-*-iso8859-1
-[Screens]
-	4
-[Sizes]
-	MediumPanelIcons
-	MediumMenuIcons
-[Commands]
-	xftree
-	xcalc
-	xterm
-	xfmouse -i
-	netscape -mail
-	xlpq
-	xfhelp
-	xv
-	None
-	None
-	None
-	None
-	xwp
-[Menu1]
-	XFClock
-	XFCE_DIR/icons/Clock.xpm
-	xfclock
-	XFTree
-	XFCE_DIR/icons/Disk_blue.xpm
-	xftree
-[Menu2]
-	Calculator
-	XFCE_DIR/icons/Calculator.xpm
-	xcalc
-	Editres
-	XFCE_DIR/icons/Editres.xpm
-	editres
-	System load
-	XFCE_DIR/icons/Meter.xpm
-	xosview
-	Magnify
-	XFCE_DIR/icons/Magnify.xpm
-	xmag
-[Menu3]
-	X-Terminal
-	XFCE_DIR/icons/Xterm.xpm
-	xterm
-	X-Edit
-	XFCE_DIR/icons/TextEditor.xpm
-	xedit
-[Menu4]
-	XFPager
-	XFCE_DIR/icons/Drawing3.xpm
-	Module xfpager
-	XFMouse
-	XFCE_DIR/icons/Mouse.xpm
-	xfmouse -i
-	XFSound
-	XFCE_DIR/icons/Sound.xpm
-	xfsound -i
-	Backdrop
-	XFCE_DIR/icons/Palette.xpm
-	xfbd -i
-[Menu5]
-	Netscape Browser
-	XFCE_DIR/icons/Netscape.xpm
-	netscape
-	Netscape Mail
-	XFCE_DIR/icons/Mail.xpm
-	netscape - mail
-[Menu6]
-	Printer
-	XFCE_DIR/icons/ABC.xpm
-	xlpq
-[Menu7]
-	WordPerfect
-	XFCE_DIR/icons/WordProcessing2.xpm
-	xwp
-	GNotepad+
-	XFCE_DIR/icons/Edit.xpm
-	gnp
-	Nedit
-	XFCE_DIR/icons/Reader.xpm
-	nedit
-[Menu8]
-	Gimp
-	XFCE_DIR/icons/Colormap.xpm
-	gimp
-	XV
-	XFCE_DIR/icons/Xv.xpm
-	xv
-	X-Paint
-	XFCE_DIR/icons/Drawing.xpm
-	xpaint
-[Menu9]
-[Menu10]
-[Menu11]
-[Menu12]
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce-3.2.1.lsm xfce-3.2.2/xfce-3.2.1.lsm
--- xfce-3.2.1/xfce-3.2.1.lsm	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfce-3.2.1.lsm	Thu Jan  1 01:00:00 1970
@@ -1,29 +0,0 @@
-Begin3
-Title		XFce
-Version:        3.2.1
-Entered-date:   14NOV99
-Description:    XFce is an easy-to-use and easy-to-configure environment 
-		using the popular GTK+ toolkit for X11, featuring drag'n drop,
-		pulldown menus and color icons, 3D widgets, etc. 
-		It features its own Window Manager (xfwm), a backdrop 
-		manager (xfbd), a file manager (xftree), a clock/calendar
-		(xfclock) and a system sound manager (xfsound) and
-		a user friendly interface for mouse configuration (xfmouse).
-		Visit HTTP://www.xfce.org/ to see what XFce looks like.
-Keywords:       desktop, utility, toolbar, icons, menu interface, 
-		window manager,	file manager, gtk+, X11, linux
-Author:         fourdan@xfce.org (Olivier Fourdan)
-Maintained-by:  fourdan@xfce.org (Olivier Fourdan)
-Primary-site:   HTTP://www.xfce.org/
-			 	 2648Kb xfce-3.2.1.tar.gz
-			 	    1Kb xfce-3.2.1.lsm
-Alternate-site:	HTTP://www.baysurf.net/linux/xfce/
-		HTTP://tsikora.tiac.net/xfce/
-Original-site:	HTTP://www.xfce.org/
-Platform:       Linux 2.xx, Solaris 2.xx 7.xx, FreeBSD 2.x.x, XFree86 3.x.x, 
-		Require GTK+ 1.2 or above and libXpm (v 4.x or above) 
-		for pixmaps.
-		Can make use of Imlib if available for image dithering and 
-		rendering. 
-Copying-policy: GPL
-End
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce-3.2.2.lsm xfce-3.2.2/xfce-3.2.2.lsm
--- xfce-3.2.1/xfce-3.2.2.lsm	Thu Jan  1 01:00:00 1970
+++ xfce-3.2.2/xfce-3.2.2.lsm	Fri Dec  3 21:16:47 1999
@@ -0,0 +1,29 @@
+Begin3
+Title		XFce
+Version:        3.2.1
+Entered-date:   14NOV99
+Description:    XFce is an easy-to-use and easy-to-configure environment 
+		using the popular GTK+ toolkit for X11, featuring drag'n drop,
+		pulldown menus and color icons, 3D widgets, etc. 
+		It features its own Window Manager (xfwm), a backdrop 
+		manager (xfbd), a file manager (xftree), a clock/calendar
+		(xfclock) and a system sound manager (xfsound) and
+		a user friendly interface for mouse configuration (xfmouse).
+		Visit HTTP://www.xfce.org/ to see what XFce looks like.
+Keywords:       desktop, utility, toolbar, icons, menu interface, 
+		window manager,	file manager, gtk+, X11, linux
+Author:         fourdan@xfce.org (Olivier Fourdan)
+Maintained-by:  fourdan@xfce.org (Olivier Fourdan)
+Primary-site:   HTTP://www.xfce.org/
+			 	 2648Kb xfce-3.2.1.tar.gz
+			 	    1Kb xfce-3.2.1.lsm
+Alternate-site:	HTTP://www.baysurf.net/linux/xfce/
+		HTTP://tsikora.tiac.net/xfce/
+Original-site:	HTTP://www.xfce.org/
+Platform:       Linux 2.xx, Solaris 2.xx 7.xx, FreeBSD 2.x.x, XFree86 3.x.x, 
+		Require GTK+ 1.2 or above and libXpm (v 4.x or above) 
+		for pixmaps.
+		Can make use of Imlib if available for image dithering and 
+		rendering. 
+Copying-policy: GPL
+End
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfce.spec xfce-3.2.2/xfce.spec
--- xfce-3.2.1/xfce.spec	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfce.spec	Sat Dec  4 10:18:06 1999
@@ -1,6 +1,6 @@
 # RPM spec file for XFce
 
-%define		Version	3.2.1
+%define		Version	3.2.2
 %define		Name	xfce
 %define		Release	1
 
@@ -89,6 +89,7 @@
 %{Bindir}/bin/xfprint
 %{Bindir}/bin/xftrash
 %{Bindir}/bin/xfterm
+%{Bindir}/bin/xflock
 %{Bindir}/bin/xfce_setup
 %{Bindir}/bin/xfce_remove
 %{Bindir}/bin/startxfce
@@ -105,11 +106,8 @@
 %{Bindir}/man/man1/xfprint.1
 %{Bindir}/man/man1/xftrash.1
 %{Bindir}/man/man1/xfterm.1
+%{Bindir}/man/man1/xflock.1
 %{Datadir}/xfce
-
-%preun
-
-%postun
 
 %changelog
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfclock/Makefile.in xfce-3.2.2/xfclock/Makefile.in
--- xfce-3.2.1/xfclock/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfclock/Makefile.in	Sat Dec  4 10:19:42 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -146,7 +147,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfclock_SOURCES)
 OBJECTS = $(xfclock_OBJECTS)
@@ -176,8 +177,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -286,7 +287,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -315,7 +316,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfgnome/Makefile.in xfce-3.2.2/xfgnome/Makefile.in
--- xfce-3.2.1/xfgnome/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfgnome/Makefile.in	Sat Dec  4 10:19:44 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -143,7 +144,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfgnome_SOURCES)
 OBJECTS = $(xfgnome_OBJECTS)
@@ -173,8 +174,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -283,7 +284,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -312,7 +313,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfmouse/Makefile.in xfce-3.2.2/xfmouse/Makefile.in
--- xfce-3.2.1/xfmouse/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfmouse/Makefile.in	Sat Dec  4 10:19:41 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -145,7 +146,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfmouse_SOURCES)
 OBJECTS = $(xfmouse_OBJECTS)
@@ -175,8 +176,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -285,7 +286,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -314,7 +315,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfpager/Makefile.in xfce-3.2.2/xfpager/Makefile.in
--- xfce-3.2.1/xfpager/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfpager/Makefile.in	Sat Dec  4 10:19:40 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -144,7 +145,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfpager_SOURCES)
 OBJECTS = $(xfpager_OBJECTS)
@@ -174,8 +175,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -284,7 +285,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -313,7 +314,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfsound/Makefile.in xfce-3.2.2/xfsound/Makefile.in
--- xfce-3.2.1/xfsound/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfsound/Makefile.in	Sat Dec  4 10:19:43 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -148,7 +149,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfsound_SOURCES)
 OBJECTS = $(xfsound_OBJECTS)
@@ -178,8 +179,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -307,7 +308,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -336,7 +337,7 @@
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \
 		$(DESTDIR)$(mandir)/man1
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xftree/Makefile.in xfce-3.2.2/xftree/Makefile.in
--- xfce-3.2.1/xftree/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xftree/Makefile.in	Sat Dec  4 10:19:40 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -147,7 +148,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xftree_SOURCES)
 OBJECTS = $(xftree_OBJECTS)
@@ -177,8 +178,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -287,7 +288,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -316,7 +317,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xftree/icons/fifo.xpm xfce-3.2.2/xftree/icons/fifo.xpm
--- xfce-3.2.1/xftree/icons/fifo.xpm	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/xftree/icons/fifo.xpm	Fri Dec  3 21:16:48 1999
@@ -6,7 +6,7 @@
 "X	c yellow",
 "o	c blue",
 "O	c lightgray",
-"      .         ",
+"                ",
 "XX   ...   XXXXX",
 "XX  oo.oo  XXXXX",
 "XX oOo.oOo XXXXX",
@@ -21,4 +21,4 @@
 "XX  ooooo  XXXXX",
 "XX   ooo   XXXXX",
 "XX   ...   XXXXX",
-"      .         "};
+"                "};
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xftree/icons/socket.xpm xfce-3.2.2/xftree/icons/socket.xpm
--- xfce-3.2.1/xftree/icons/socket.xpm	Wed Nov 10 03:20:00 1999
+++ xfce-3.2.2/xftree/icons/socket.xpm	Fri Dec  3 21:16:48 1999
@@ -5,7 +5,7 @@
 ".	c blue",
 "X	c blue4",
 "o	c black",
-"           .    ",
+"                ",
 "          .X    ",
 "         .X     ",
 "        .X      ",
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xftree/xtree_gui.c xfce-3.2.2/xftree/xtree_gui.c
--- xfce-3.2.1/xftree/xtree_gui.c	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xftree/xtree_gui.c	Fri Dec  3 21:16:48 1999
@@ -1176,8 +1176,8 @@
 	strcpy (pattern, "*.c");
 	sprintf(path, _("Find pattern in '%s'"), en->path);
 	if (dlg_string (path, pattern) == DLG_RC_OK) {
-		sprintf (path, "xterm -e sh -c \"find %s -name '%s' -print | more ; echo Press ENTER; read\"",
-			en->path, pattern);
+		sprintf (path, "%s -e sh -c \"find %s -name '%s' -print | more ; echo Press ENTER; read\"",
+			TERMINAL, en->path, pattern);
 		io_system (path);
 	}
 }
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfwm/Makefile.in xfce-3.2.2/xfwm/Makefile.in
--- xfce-3.2.1/xfwm/Makefile.in	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfwm/Makefile.in	Sat Dec  4 10:19:39 1999
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -149,7 +150,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(xfwm_SOURCES)
 OBJECTS = $(xfwm_OBJECTS)
@@ -179,8 +180,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -289,7 +290,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -318,7 +319,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
 
diff -Naur -x Makefile -x *.gmo -x *.jpg xfce-3.2.1/xfwm/move.c xfce-3.2.2/xfwm/move.c
--- xfce-3.2.1/xfwm/move.c	Fri Dec  3 22:22:40 1999
+++ xfce-3.2.2/xfwm/move.c	Fri Dec  3 22:11:56 1999
@@ -393,7 +393,8 @@
      frame_wc.y = tmp_win->frame_y = tmp_win->shade_y = yt;
      frame_mask = (CWX | CWY);
      XConfigureWindow (dpy, tmp_win->frame, frame_mask, &frame_wc);
-     sendclient_event(tmp_win, xl, yt, Width, Height);
+     if (!(tmp_win->flags & SHADED))
+       sendclient_event(tmp_win, xl, yt, Width, Height);
    }
 }