From: unknown <unknown>
Date: Tue, 7 May 2002 15:28:39 +0000 (+0000)
Subject: This commit was manufactured by cvs2svn to create tag
X-Git-Tag: openbox-1_0_1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a230c3c84f06d263f5806ca46e6394a4edd11be9;p=dana%2Fopenbox.git

This commit was manufactured by cvs2svn to create tag
'openbox-1_0_1'.
---

a230c3c84f06d263f5806ca46e6394a4edd11be9
diff --cc CHANGELOG
index 338776d9,2422700f..84c731cf
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,47 +1,40 @@@
  Changelog for Openbox:
  
 -1.1.0:
 - * bsetroot supports transparent applications by
 -   setting the xrootpmap_id property on the root
 -   window                                               (Sean Perry)
 -
 - * added ClickMouse window placement algorithm/type.    (Ben Jansens)
 - 
 - * added UnderMouse window placement algorithm/type.    (Ben Jansens)
 -
++1.0.1:
+  * improved logic for decorating windows when the
 -   decoration level is changed                          (Ben Jansens)
++   decoration level is changed.                         (Ben Jansens)
+ 
 - * fix positioning of the window menu                   (Ben Jansens)
++ * fix positioning of the window menu.                  (Ben Jansens)
+ 
+  * save the titlebarLayout in the default config file.  (Ben Jansens)
+ 
++ * gcc 3 compatibilty                                   (Ben Jansens)
++
+ 1.0.0:
+  * maximizing windows takes the slit into account as
+    well as the toolbar when 'Full Maximization' is off  (Ben Jansens)
+ 
+  * better handling of the rc file and its configuration
+    options. The file is written each time an option in
+    the file is changed, instead of being written at
+    shutdown. This means that you can edit the file by
+    hand while in Openbox, and then choose reconfig or
+    restart to have it use the new rc file.              (Ben Jansens)
+ 
+  * added a runtime option for hiding the toolbar.       (Scott Moynes)
+ 	
+  * made shaded windows edge-snap correctly to the
+    bottom for their size instead for their unshaded
+    size.                                                (Ben Jansens)
+ 
+  * added BestFit window placement algorithm/type.       (Ruhi Bloodworth)
+ 
++0.99.1:
+  * forced a redraw of the close button after pressing
+    it. Some applications (eg. acroread) ignore the
+    close request and you end up with a funky close
+    button.                                              (Scott Moynes)
+ 
 - * fix positioning of the window menu                   (Ben Jansens)
 -
  0.99.0:
   * renamed header files from *.hh to *.h.               (Ben Jansens)
  
diff --cc Makefile.in
index e1ddc32e,3622bd79..e88d6bf7
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
@@@ -106,7 -106,7 +106,7 @@@ Makefile: $(srcdir)/Makefile.in  $(top_
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
  	cd $(srcdir) && $(ACLOCAL)
  
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
@@@ -177,7 -177,7 +177,7 @@@ maintainer-clean-recursive
  	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
++	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
diff --cc config.h.in
index b4f73d3f,b4f73d3f..cb7c7ee7
--- a/config.h.in
+++ b/config.h.in
@@@ -99,6 -99,6 +99,9 @@@
  /* Define to 1 if you have the <sys/wait.h> header file. */
  #undef HAVE_SYS_WAIT_H
  
++/* Define to 1 if you have the <sstream> header file. */
++#undef HAVE_SSTREAM
++
  /* Define to 1 if you have the <time.h> header file. */
  #undef HAVE_TIME_H
  
diff --cc configure
index 6c1c5dd7,4a2aa002..936b2e94
--- a/configure
+++ b/configure
@@@ -1,310 -1,310 +1,52 @@@
  #! /bin/sh
++
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.53.
++# Generated automatically using autoconf version 2.13 
++# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
--
--# Be Bourne compatible
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
--fi
--
--# NLS nuisances.
--# Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
--(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
--    { $as_unset LANG || test "${LANG+set}" != set; } ||
--      { LANG=C; export LANG; }
--(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
--    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
--      { LC_ALL=C; export LC_ALL; }
--(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
--    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
--      { LC_TIME=C; export LC_TIME; }
--(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
--    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
--      { LC_CTYPE=C; export LC_CTYPE; }
--(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
--    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
--      { LANGUAGE=C; export LANGUAGE; }
--(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
--    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
--      { LC_COLLATE=C; export LC_COLLATE; }
--(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
--    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
--      { LC_NUMERIC=C; export LC_NUMERIC; }
--(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
--    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
--      { LC_MESSAGES=C; export LC_MESSAGES; }
--
--
--# Name of the executable.
--as_me=`(basename "$0") 2>/dev/null ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conftest.sh
--fi
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
--    sed '
--      N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
--      t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
--    ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
--
--  # Don't try to exec as it changes $[0], causing all sort of problems
--  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
--  # Exit status is that of the last command.
--  exit
--}
--
--
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
--esac
--
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--rm -f conf$$ conf$$.exe conf$$.file
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
--    as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
--else
--  as_ln_s='cp -p'
--fi
--rm -f conf$$ conf$$.exe conf$$.file
--
--as_executable_p="test -f"
--
--# Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
--
--# Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
--
--
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
--
--
--# Name of the host.
--# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
--# so uname gets run too.
--ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
--
--exec 6>&1
--
--#
--# Initializations.
--#
++# Defaults:
++ac_help=
  ac_default_prefix=/usr/local
--cross_compiling=no
--subdirs=
--MFLAGS=
--MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
--
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete.  It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
--# Identity of this package.
--PACKAGE_NAME=
--PACKAGE_TARNAME=
--PACKAGE_VERSION=
--PACKAGE_STRING=
--PACKAGE_BUGREPORT=
--
--ac_unique_file="src/openbox.cc"
--# Factoring default headers for most tests.
--ac_includes_default="\
--#include <stdio.h>
--#if HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#if HAVE_SYS_STAT_H
--# include <sys/stat.h>
--#endif
--#if STDC_HEADERS
--# include <stdlib.h>
--# include <stddef.h>
--#else
--# if HAVE_STDLIB_H
--#  include <stdlib.h>
--# endif
--#endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
--#  include <memory.h>
--# endif
--# include <string.h>
--#endif
--#if HAVE_STRINGS_H
--# include <strings.h>
--#endif
--#if HAVE_INTTYPES_H
--# include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
--#endif
--#if HAVE_UNISTD_H
--# include <unistd.h>
--#endif"
--
++# Any additions from configure.in:
++ac_help="$ac_help
++  --with-x                use the X Window System"
++ac_help="$ac_help
++  --enable-shape          enable support of the XShape extension [default=yes]"
++ac_help="$ac_help
++  --enable-slit           include code for the Slit [default=yes]"
++ac_help="$ac_help
++  --enable-newspec        include code for the new WM Spec (DOES NOTHING)
++                          [default=no]"
++ac_help="$ac_help
++  --enable-interlace      include code for image interlacing [default=yes]"
++ac_help="$ac_help
++  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
++                          dithering [default=no]"
++ac_help="$ac_help
++  --enable-clobber        intercept mouse events to clients when num lock 
++			  or scroll lock are on [default=yes]"
++ac_help="$ac_help
++  --enable-debug          include verbose debugging code [default=no]"
++ac_help="$ac_help
++  --enable-nls            include natural language support [default=yes]"
++ac_help="$ac_help
++  --enable-timed-cache    use new timed pixmap cache [default=yes]"
++ac_help="$ac_help
++  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer"
  
  # Initialize some variables set by options.
--ac_init_help=
--ac_init_version=false
  # The variables have the same names as the options, with
  # dashes changed to underlines.
--cache_file=/dev/null
++build=NONE
++cache_file=./config.cache
  exec_prefix=NONE
++host=NONE
  no_create=
++nonopt=NONE
  no_recursion=
  prefix=NONE
  program_prefix=NONE
@@@ -313,15 -313,15 +55,10 @@@ program_transform_name=s,x,x
  silent=
  site=
  srcdir=
++target=NONE
  verbose=
  x_includes=NONE
  x_libraries=NONE
--
--# Installation directory options.
--# These are left unexpanded so users can "make install exec_prefix=/foo"
--# and all the variables that are supposed to be based on exec_prefix
--# by default will actually change.
--# Use braces instead of parens because sh, perl, etc. also accept them.
  bindir='${exec_prefix}/bin'
  sbindir='${exec_prefix}/sbin'
  libexecdir='${exec_prefix}/libexec'
@@@ -335,9 -335,9 +72,17 @@@ oldincludedir='/usr/include
  infodir='${prefix}/info'
  mandir='${prefix}/man'
  
++# Initialize some other variables.
++subdirs=
++MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++# Maximum number of lines to put in a shell here document.
++ac_max_here_lines=12
++
  ac_prev=
  for ac_option
  do
++
    # If the previous option needs an argument, assign it.
    if test -n "$ac_prev"; then
      eval "$ac_prev=\$ac_option"
@@@ -345,59 -345,59 +90,59 @@@
      continue
    fi
  
--  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case "$ac_option" in
++  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) ac_optarg= ;;
++  esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
  
--  case $ac_option in
++  case "$ac_option" in
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
    -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
--    bindir=$ac_optarg ;;
++    bindir="$ac_optarg" ;;
  
    -build | --build | --buil | --bui | --bu)
--    ac_prev=build_alias ;;
++    ac_prev=build ;;
    -build=* | --build=* | --buil=* | --bui=* | --bu=*)
--    build_alias=$ac_optarg ;;
++    build="$ac_optarg" ;;
  
    -cache-file | --cache-file | --cache-fil | --cache-fi \
    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
      ac_prev=cache_file ;;
    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
--    cache_file=$ac_optarg ;;
--
--  --config-cache | -C)
--    cache_file=config.cache ;;
++    cache_file="$ac_optarg" ;;
  
    -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
      ac_prev=datadir ;;
    -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
    | --da=*)
--    datadir=$ac_optarg ;;
++    datadir="$ac_optarg" ;;
  
    -disable-* | --disable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    eval "enable_$ac_feature=no" ;;
++    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    eval "enable_${ac_feature}=no" ;;
  
    -enable-* | --enable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    case "$ac_option" in
++      *=*) ;;
        *) ac_optarg=yes ;;
      esac
--    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval "enable_${ac_feature}='$ac_optarg'" ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@@ -406,47 -406,47 +151,95 @@@
    -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
    | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
    | --exec=* | --exe=* | --ex=*)
--    exec_prefix=$ac_optarg ;;
++    exec_prefix="$ac_optarg" ;;
  
    -gas | --gas | --ga | --g)
      # Obsolete; use --with-gas.
      with_gas=yes ;;
  
--  -help | --help | --hel | --he | -h)
--    ac_init_help=long ;;
--  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
--    ac_init_help=recursive ;;
--  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
--    ac_init_help=short ;;
++  -help | --help | --hel | --he)
++    # Omit some internal or obsolete options to make the list less imposing.
++    # This message is too long to be a string in the A/UX 3.1 sh.
++    cat << EOF
++Usage: configure [options] [host]
++Options: [defaults in brackets after descriptions]
++Configuration:
++  --cache-file=FILE       cache test results in FILE
++  --help                  print this message
++  --no-create             do not create output files
++  --quiet, --silent       do not print \`checking...' messages
++  --version               print the version of autoconf that created configure
++Directory and file names:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++                          [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++                          [same as prefix]
++  --bindir=DIR            user executables in DIR [EPREFIX/bin]
++  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
++  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
++  --datadir=DIR           read-only architecture-independent data in DIR
++                          [PREFIX/share]
++  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
++                          [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
++  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
++  --includedir=DIR        C header files in DIR [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
++  --infodir=DIR           info documentation in DIR [PREFIX/info]
++  --mandir=DIR            man documentation in DIR [PREFIX/man]
++  --srcdir=DIR            find the sources in DIR [configure dir or ..]
++  --program-prefix=PREFIX prepend PREFIX to installed program names
++  --program-suffix=SUFFIX append SUFFIX to installed program names
++  --program-transform-name=PROGRAM
++                          run sed PROGRAM on installed program names
++EOF
++    cat << EOF
++Host type:
++  --build=BUILD           configure for building on BUILD [BUILD=HOST]
++  --host=HOST             configure for HOST [guessed]
++  --target=TARGET         configure for TARGET [TARGET=HOST]
++Features and packages:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --x-includes=DIR        X include files are in DIR
++  --x-libraries=DIR       X library files are in DIR
++EOF
++    if test -n "$ac_help"; then
++      echo "--enable and --with options recognized:$ac_help"
++    fi
++    exit 0 ;;
  
    -host | --host | --hos | --ho)
--    ac_prev=host_alias ;;
++    ac_prev=host ;;
    -host=* | --host=* | --hos=* | --ho=*)
--    host_alias=$ac_optarg ;;
++    host="$ac_optarg" ;;
  
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
    -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
    | --includ=* | --inclu=* | --incl=* | --inc=*)
--    includedir=$ac_optarg ;;
++    includedir="$ac_optarg" ;;
  
    -infodir | --infodir | --infodi | --infod | --info | --inf)
      ac_prev=infodir ;;
    -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
--    infodir=$ac_optarg ;;
++    infodir="$ac_optarg" ;;
  
    -libdir | --libdir | --libdi | --libd)
      ac_prev=libdir ;;
    -libdir=* | --libdir=* | --libdi=* | --libd=*)
--    libdir=$ac_optarg ;;
++    libdir="$ac_optarg" ;;
  
    -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
    | --libexe | --libex | --libe)
      ac_prev=libexecdir ;;
    -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
    | --libexe=* | --libex=* | --libe=*)
--    libexecdir=$ac_optarg ;;
++    libexecdir="$ac_optarg" ;;
  
    -localstatedir | --localstatedir | --localstatedi | --localstated \
    | --localstate | --localstat | --localsta | --localst \
@@@ -455,19 -455,19 +248,19 @@@
    -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
    | --localstate=* | --localstat=* | --localsta=* | --localst=* \
    | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
--    localstatedir=$ac_optarg ;;
++    localstatedir="$ac_optarg" ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
      ac_prev=mandir ;;
    -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
--    mandir=$ac_optarg ;;
++    mandir="$ac_optarg" ;;
  
    -nfp | --nfp | --nf)
      # Obsolete; use --without-fp.
      with_fp=no ;;
  
    -no-create | --no-create | --no-creat | --no-crea | --no-cre \
--  | --no-cr | --no-c | -n)
++  | --no-cr | --no-c)
      no_create=yes ;;
  
    -no-recursion | --no-recursion | --no-recursio | --no-recursi \
@@@ -481,26 -481,26 +274,26 @@@
    -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
    | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
    | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
--    oldincludedir=$ac_optarg ;;
++    oldincludedir="$ac_optarg" ;;
  
    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
      ac_prev=prefix ;;
    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
--    prefix=$ac_optarg ;;
++    prefix="$ac_optarg" ;;
  
    -program-prefix | --program-prefix | --program-prefi | --program-pref \
    | --program-pre | --program-pr | --program-p)
      ac_prev=program_prefix ;;
    -program-prefix=* | --program-prefix=* | --program-prefi=* \
    | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
--    program_prefix=$ac_optarg ;;
++    program_prefix="$ac_optarg" ;;
  
    -program-suffix | --program-suffix | --program-suffi | --program-suff \
    | --program-suf | --program-su | --program-s)
      ac_prev=program_suffix ;;
    -program-suffix=* | --program-suffix=* | --program-suffi=* \
    | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
--    program_suffix=$ac_optarg ;;
++    program_suffix="$ac_optarg" ;;
  
    -program-transform-name | --program-transform-name \
    | --program-transform-nam | --program-transform-na \
@@@ -517,7 -517,7 +310,7 @@@
    | --program-transfo=* | --program-transf=* \
    | --program-trans=* | --program-tran=* \
    | --progr-tra=* | --program-tr=* | --program-t=*)
--    program_transform_name=$ac_optarg ;;
++    program_transform_name="$ac_optarg" ;;
  
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
@@@ -527,7 -527,7 +320,7 @@@
      ac_prev=sbindir ;;
    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
    | --sbi=* | --sb=*)
--    sbindir=$ac_optarg ;;
++    sbindir="$ac_optarg" ;;
  
    -sharedstatedir | --sharedstatedir | --sharedstatedi \
    | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@@ -538,57 -538,57 +331,58 @@@
    | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
    | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
    | --sha=* | --sh=*)
--    sharedstatedir=$ac_optarg ;;
++    sharedstatedir="$ac_optarg" ;;
  
    -site | --site | --sit)
      ac_prev=site ;;
    -site=* | --site=* | --sit=*)
--    site=$ac_optarg ;;
++    site="$ac_optarg" ;;
  
    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
      ac_prev=srcdir ;;
    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
--    srcdir=$ac_optarg ;;
++    srcdir="$ac_optarg" ;;
  
    -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
    | --syscon | --sysco | --sysc | --sys | --sy)
      ac_prev=sysconfdir ;;
    -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
    | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
--    sysconfdir=$ac_optarg ;;
++    sysconfdir="$ac_optarg" ;;
  
    -target | --target | --targe | --targ | --tar | --ta | --t)
--    ac_prev=target_alias ;;
++    ac_prev=target ;;
    -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
--    target_alias=$ac_optarg ;;
++    target="$ac_optarg" ;;
  
    -v | -verbose | --verbose | --verbos | --verbo | --verb)
      verbose=yes ;;
  
--  -version | --version | --versio | --versi | --vers | -V)
--    ac_init_version=: ;;
++  -version | --version | --versio | --versi | --vers)
++    echo "configure generated by autoconf version 2.13"
++    exit 0 ;;
  
    -with-* | --with-*)
--    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
++    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
      ac_package=`echo $ac_package| sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++    case "$ac_option" in
++      *=*) ;;
        *) ac_optarg=yes ;;
      esac
--    eval "with_$ac_package='$ac_optarg'" ;;
++    eval "with_${ac_package}='$ac_optarg'" ;;
  
    -without-* | --without-*)
--    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/-/_/g'`
--    eval "with_$ac_package=no" ;;
++    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    eval "with_${ac_package}=no" ;;
  
    --x)
      # Obsolete; use --with-x.
@@@ -599,110 -599,110 +393,99 @@@
      ac_prev=x_includes ;;
    -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
    | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
--    x_includes=$ac_optarg ;;
++    x_includes="$ac_optarg" ;;
  
    -x-libraries | --x-libraries | --x-librarie | --x-librari \
    | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
      ac_prev=x_libraries ;;
    -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
--    x_libraries=$ac_optarg ;;
++    x_libraries="$ac_optarg" ;;
  
--  -*) { echo "$as_me: error: unrecognized option: $ac_option
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; }
++  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
      ;;
  
--  *=*)
--    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
--    # Reject names that are not valid shell variable names.
--    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
--   { (exit 1); exit 1; }; }
--    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
--    eval "$ac_envvar='$ac_optarg'"
--    export $ac_envvar ;;
--
    *)
--    # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
--    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++      echo "configure: warning: $ac_option: invalid host type" 1>&2
++    fi
++    if test "x$nonopt" != xNONE; then
++      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    fi
++    nonopt="$ac_option"
      ;;
  
    esac
  done
  
  if test -n "$ac_prev"; then
--  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { echo "$as_me: error: missing argument to $ac_option" >&2
--   { (exit 1); exit 1; }; }
++  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
  fi
  
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
--  esac
--done
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 6 checking for... messages and results
++# 5 compiler messages saved in config.log
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>./config.log
  
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--              localstatedir libdir includedir oldincludedir infodir mandir
++echo "\
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++" 1>&5
++
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Also quote any args containing shell metacharacters.
++ac_configure_args=
++for ac_arg
  do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
++  case "$ac_arg" in
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c) ;;
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
++  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
++  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
    esac
  done
  
--# There might be people who depend on the old broken behavior: `$host'
--# used to hold the argument of --host etc.
--# FIXME: To remove some day.
--build=$build_alias
--host=$host_alias
--target=$target_alias
--
--# FIXME: To remove some day.
--if test "x$host_alias" != x; then
--  if test "x$build_alias" = x; then
--    cross_compiling=maybe
--    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used." >&2
--  elif test "x$build_alias" != "x$host_alias"; then
--    cross_compiling=yes
--  fi
--fi
--
--ac_tool_prefix=
--test -n "$host_alias" && ac_tool_prefix=$host_alias-
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
  
--test "$silent" = yes && exec 6>/dev/null
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo > confdefs.h
  
++# A filename unique to this package, relative to the directory that
++# configure is in, which we can look for to find out if srcdir is correct.
++ac_unique_file=src/openbox.cc
  
  # Find the source files, if location was not specified.
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
--$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$0" : 'X\(//\)[^/]' \| \
--         X"$0" : 'X\(//\)$' \| \
--         X"$0" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
--echo X"$0" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
++  ac_prog=$0
++  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
++  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
    srcdir=$ac_confdir
    if test ! -r $srcdir/$ac_unique_file; then
      srcdir=..
@@@ -712,404 -712,404 +495,13 @@@ els
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
++    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
    else
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
++    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
    fi
  fi
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CXX_set=${CXX+set}
--ac_env_CXX_value=$CXX
--ac_cv_env_CXX_set=${CXX+set}
--ac_cv_env_CXX_value=$CXX
--ac_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_env_CXXFLAGS_value=$CXXFLAGS
--ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--
--#
--# Report the --help message.
--#
--if test "$ac_init_help" = "long"; then
--  # Omit some internal or obsolete options to make the list less imposing.
--  # This message is too long to be a string in the A/UX 3.1 sh.
--  cat <<_ACEOF
--\`configure' configures this package to adapt to many kinds of systems.
--
--Usage: $0 [OPTION]... [VAR=VALUE]...
--
--To assign environment variables (e.g., CC, CFLAGS...), specify them as
--VAR=VALUE.  See below for descriptions of some of the useful variables.
--
--Defaults for the options are specified in brackets.
--
--Configuration:
--  -h, --help              display this help and exit
--      --help=short        display options specific to this package
--      --help=recursive    display the short help of all the included packages
--  -V, --version           display version information and exit
--  -q, --quiet, --silent   do not print \`checking...' messages
--      --cache-file=FILE   cache test results in FILE [disabled]
--  -C, --config-cache      alias for \`--cache-file=config.cache'
--  -n, --no-create         do not create output files
--      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
--
--_ACEOF
--
--  cat <<_ACEOF
--Installation directories:
--  --prefix=PREFIX         install architecture-independent files in PREFIX
--                          [$ac_default_prefix]
--  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--                          [PREFIX]
--
--By default, \`make install' will install all the files in
--\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
--an installation prefix other than \`$ac_default_prefix' using \`--prefix',
--for instance \`--prefix=\$HOME'.
--
--For better control, use the options below.
--
--Fine tuning of the installation directories:
--  --bindir=DIR           user executables [EPREFIX/bin]
--  --sbindir=DIR          system admin executables [EPREFIX/sbin]
--  --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
--  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
--  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
--  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
--  --libdir=DIR           object code libraries [EPREFIX/lib]
--  --includedir=DIR       C header files [PREFIX/include]
--  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --infodir=DIR          info documentation [PREFIX/info]
--  --mandir=DIR           man documentation [PREFIX/man]
--_ACEOF
--
--  cat <<\_ACEOF
--
--Program names:
--  --program-prefix=PREFIX            prepend PREFIX to installed program names
--  --program-suffix=SUFFIX            append SUFFIX to installed program names
--  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
--
--X features:
--  --x-includes=DIR    X include files are in DIR
--  --x-libraries=DIR   X library files are in DIR
--_ACEOF
--fi
--
--if test -n "$ac_init_help"; then
--
--  cat <<\_ACEOF
--
--Optional Features:
--  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
--  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --enable-shape          enable support of the XShape extension default=yes
--  --enable-slit           include code for the Slit default=yes
--  --enable-newspec        include code for the new WM Spec (DOES NOTHING)
--                          default=no
--  --enable-interlace      include code for image interlacing default=yes
--  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
--                          dithering default=no
--  --enable-clobber        intercept mouse events to clients when num lock
--			  or scroll lock are on default=yes
--  --enable-debug          include verbose debugging code default=no
--  --enable-nls            include natural language support default=yes
--  --enable-timed-cache    use new timed pixmap cache default=yes
--  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer
--
--Optional Packages:
--  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
--  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --with-x                use the X Window System
--
--Some influential environment variables:
--  CC          C compiler command
--  CFLAGS      C compiler flags
--  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
--              nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
--  CXX         C++ compiler command
--  CXXFLAGS    C++ compiler flags
--  CPP         C preprocessor
--
--Use these variables to override the choices made by `configure' or to help
--it to find libraries and programs with nonstandard names/locations.
--
--_ACEOF
--fi
--
--if test "$ac_init_help" = "recursive"; then
--  # If there are subdirs, report their specific --help.
--  ac_popdir=`pwd`
--  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d $ac_dir || continue
--    ac_builddir=.
--
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
--
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--
--    cd $ac_dir
--    # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_srcdir/configure.gnu; then
--      echo
--      $SHELL $ac_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_srcdir/configure; then
--      echo
--      $SHELL $ac_srcdir/configure  --help=recursive
--    elif test -f $ac_srcdir/configure.ac ||
--           test -f $ac_srcdir/configure.in; then
--      echo
--      $ac_configure --help
--    else
--      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi
--    cd $ac_popdir
--  done
--fi
--
--test -n "$ac_init_help" && exit 0
--if $ac_init_version; then
--  cat <<\_ACEOF
--
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
--_ACEOF
--  exit 0
--fi
--exec 5>config.log
--cat >&5 <<_ACEOF
--This file contains any messages produced by compilers while
--running configure, to aid debugging if configure makes a mistake.
--
--It was created by $as_me, which was
--generated by GNU Autoconf 2.53.  Invocation command line was
--
--  $ $0 $@
--
--_ACEOF
--{
--cat <<_ASUNAME
--## --------- ##
--## Platform. ##
--## --------- ##
--
--hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
--uname -m = `(uname -m) 2>/dev/null || echo unknown`
--uname -r = `(uname -r) 2>/dev/null || echo unknown`
--uname -s = `(uname -s) 2>/dev/null || echo unknown`
--uname -v = `(uname -v) 2>/dev/null || echo unknown`
--
--/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
--/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
--
--/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
--/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
--/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
--/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
--/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
--/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
--
--_ASUNAME
--
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  echo "PATH: $as_dir"
--done
--
--} >&5
--
--cat >&5 <<_ACEOF
--
--
--## ----------- ##
--## Core tests. ##
--## ----------- ##
--
--_ACEOF
--
--
--# Keep a trace of the command line.
--# Strip out --no-create and --no-recursion so they do not pile up.
--# Also quote any args containing shell meta-characters.
--ac_configure_args=
--ac_sep=
--for ac_arg
--do
--  case $ac_arg in
--  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
--  | --no-cr | --no-c | -n ) continue ;;
--  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
--  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
--    continue ;;
--  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
--  esac
--  case " $ac_configure_args " in
--    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
--    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--       ac_sep=" " ;;
--  esac
--  # Get rid of the leading space.
--done
--
--# When interrupted or exit'd, cleanup temporary files, and complete
--# config.log.  We remove comments because anyway the quotes in there
--# would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
--trap 'exit_status=$?
--  # Save into config.log some information that might help in debugging.
--  {
--    echo
--    cat <<\_ASBOX
--## ---------------- ##
--## Cache variables. ##
--## ---------------- ##
--_ASBOX
--    echo
--    # The following way of writing the cache mishandles newlines in values,
--{
--  (set) 2>&1 |
--    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      sed -n \
--        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
--      ;;
--    *)
--      sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--}
--    echo
--    if test -s confdefs.h; then
--      cat <<\_ASBOX
--## ----------- ##
--## confdefs.h. ##
--## ----------- ##
--_ASBOX
--      echo
--      sed "/^$/d" confdefs.h
--      echo
--    fi
--    test "$ac_signal" != 0 &&
--      echo "$as_me: caught signal $ac_signal"
--    echo "$as_me: exit $exit_status"
--  } >&5
--  rm -f core core.* *.core &&
--  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
--    exit $exit_status
--     ' 0
--for ac_signal in 1 2 13 15; do
--  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
--done
--ac_signal=0
--
--# confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
--
--# Predefined preprocessor variables.
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_NAME "$PACKAGE_NAME"
--_ACEOF
--
++srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
  
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
--_ACEOF
--
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_VERSION "$PACKAGE_VERSION"
--_ACEOF
--
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_STRING "$PACKAGE_STRING"
--_ACEOF
--
--
--cat >>confdefs.h <<_ACEOF
--#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
--_ACEOF
--
--
--# Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
@@@ -1120,102 -1120,102 +512,39 @@@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
--    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--echo "$as_me: loading site script $ac_site_file" >&6;}
--    sed 's/^/| /' "$ac_site_file" >&5
++    echo "loading site script $ac_site_file"
      . "$ac_site_file"
    fi
  done
  
  if test -r "$cache_file"; then
--  # Some versions of bash will fail to source /dev/null (special
--  # files actually), so we avoid doing that.
--  if test -f "$cache_file"; then
--    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
--echo "$as_me: loading cache $cache_file" >&6;}
--    case $cache_file in
--      [\\/]* | ?:[\\/]* ) . $cache_file;;
--      *)                      . ./$cache_file;;
--    esac
--  fi
++  echo "loading cache $cache_file"
++  . $cache_file
  else
--  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
--echo "$as_me: creating cache $cache_file" >&6;}
--  >$cache_file
--fi
--
--# Check that the precious variables saved in the cache have kept the same
--# value.
--ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
--               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
--  eval ac_old_set=\$ac_cv_env_${ac_var}_set
--  eval ac_new_set=\$ac_env_${ac_var}_set
--  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
--  eval ac_new_val="\$ac_env_${ac_var}_value"
--  case $ac_old_set,$ac_new_set in
--    set,)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
--      ac_cache_corrupted=: ;;
--    ,set)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
--      ac_cache_corrupted=: ;;
--    ,);;
--    *)
--      if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
--echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
--echo "$as_me:   current value: $ac_new_val" >&2;}
--        ac_cache_corrupted=:
--      fi;;
--  esac
--  # Pass precious variables to config.status.
--  if test "$ac_new_set" = set; then
--    case $ac_new_val in
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
--    *) ac_arg=$ac_var=$ac_new_val ;;
--    esac
--    case " $ac_configure_args " in
--      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
--      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
--    esac
--  fi
--done
--if $ac_cache_corrupted; then
--  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
++  echo "creating cache $cache_file"
++  > $cache_file
  fi
  
  ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++ac_exeext=
++ac_objext=o
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
  
  
  ac_aux_dir=
@@@ -1228,20 -1228,20 +557,14 @@@ for ac_dir in $srcdir $srcdir/.. $srcdi
      ac_aux_dir=$ac_dir
      ac_install_sh="$ac_aux_dir/install.sh -c"
      break
--  elif test -f $ac_dir/shtool; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/shtool install -c"
--    break
    fi
  done
  if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
--echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
--   { (exit 1); exit 1; }; }
++  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
  fi
--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.
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
@@@ -1250,78 -1250,78 +573,65 @@@
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
--# AmigaOS /C/install, which installs bootblocks on floppy discs
  # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:582: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
--if test "${ac_cv_path_install+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  # Account for people who put trailing slashes in PATH elements.
--case $as_dir/ in
--  ./ | .// | /cC/* | \
--  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
--  /usr/ucb/* ) ;;
--  *)
--    # OSF1 and SCO ODT 3.0 have their own names for install.
--    # Don't use installbsd from OSF since it installs stuff as root
--    # by default.
--    for ac_prog in ginstall scoinst install; do
--      for ac_exec_ext in '' $ac_executable_extensions; do
--        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
--          if test $ac_prog = install &&
--            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
--            # AIX install.  It has an incompatible calling convention.
--            :
--          elif test $ac_prog = install &&
--            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
--            # program-specific install script used by HP pwplus--don't use.
--            :
--          else
--            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--            break 3
--          fi
--        fi
++if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
++  for ac_dir in $PATH; do
++    # Account for people who put trailing slashes in PATH elements.
++    case "$ac_dir/" in
++    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    *)
++      # OSF1 and SCO ODT 3.0 have their own names for install.
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
++        if test -f $ac_dir/$ac_prog; then
++	  if test $ac_prog = install &&
++            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  else
++	    ac_cv_path_install="$ac_dir/$ac_prog -c"
++	    break 2
++	  fi
++	fi
        done
--    done
--    ;;
--esac
--done
--
++      ;;
++    esac
++  done
++  IFS="$ac_save_IFS"
  
  fi
    if test "${ac_cv_path_install+set}" = set; then
--    INSTALL=$ac_cv_path_install
++    INSTALL="$ac_cv_path_install"
    else
      # As a last resort, use the slow shell script.  We don't cache a
      # path for INSTALL within a source directory, because that will
      # break other packages using the cache if that directory is
      # removed, or if the path is relative.
--    INSTALL=$ac_install_sh
++    INSTALL="$ac_install_sh"
    fi
  fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
++echo "$ac_t""$INSTALL" 1>&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
++echo "configure:635: checking whether build environment is sane" >&5
  # Just in case
  sleep 1
  echo timestamp > conftestfile
@@@ -1343,11 -1343,11 +653,8 @@@ if 
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
--      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" >&5
--echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" >&2;}
--   { (exit 1); exit 1; }; }
++      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" 1>&2; exit 1; }
     fi
  
     test "$2" = conftestfile
@@@ -1356,144 -1356,144 +663,132 @@@ the
     # Ok.
     :
  else
--   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
--Check your system clock" >&5
--echo "$as_me: error: newly created file is older than distributed files!
--Check your system clock" >&2;}
--   { (exit 1); exit 1; }; }
++   { echo "configure: error: newly created file is older than distributed files!
++Check your system clock" 1>&2; exit 1; }
  fi
  rm -f conftest*
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++echo "$ac_t""yes" 1>&6
++if test "$program_transform_name" = s,x,x,; then
++  program_transform_name=
++else
++  # Double any \ or $.  echo might interpret backslashes.
++  cat <<\EOF_SED > conftestsed
++s,\\,\\\\,g; s,\$,$$,g
++EOF_SED
++  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
++  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"
--# Double any \ or $.  echo might interpret backslashes.
--# By default was `s,x,x', remove it if useless.
--cat <<\_ACEOF >conftest.sed
--s/[\\$]/&&/g;s/;s,x,x,$//
--_ACEOF
--program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
--
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.make <<\_ACEOF
++  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:692: checking whether ${MAKE-make} sets \${MAKE}" >&5
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftestmake <<\EOF
  all:
  	@echo 'ac_maketemp="${MAKE}"'
--_ACEOF
++EOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
  if test -n "$ac_maketemp"; then
    eval ac_cv_prog_make_${ac_make}_set=yes
  else
    eval ac_cv_prog_make_${ac_make}_set=no
  fi
--rm -f conftest.make
++rm -f conftestmake
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++  echo "$ac_t""yes" 1>&6
    SET_MAKE=
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
  
  PACKAGE=openbox
  
- VERSION=0.99.0
 -VERSION=1.0.0
++VERSION=1.0.1
  
  if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
--echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
--   { (exit 1); exit 1; }; }
++  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
  fi
  
  
  
  missing_dir=`cd $ac_aux_dir && pwd`
--echo "$as_me:$LINENO: checking for working aclocal" >&5
--echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
++echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
++echo "configure:731: 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.
  if (aclocal --version) < /dev/null > /dev/null 2>&1; then
     ACLOCAL=aclocal
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
++   echo "$ac_t""found" 1>&6
  else
     ACLOCAL="$missing_dir/missing aclocal"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
++   echo "$ac_t""missing" 1>&6
  fi
  
--echo "$as_me:$LINENO: checking for working autoconf" >&5
--echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
++echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
++echo "configure:744: 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.
  if (autoconf --version) < /dev/null > /dev/null 2>&1; then
     AUTOCONF=autoconf
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
++   echo "$ac_t""found" 1>&6
  else
     AUTOCONF="$missing_dir/missing autoconf"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
++   echo "$ac_t""missing" 1>&6
  fi
  
--echo "$as_me:$LINENO: checking for working automake" >&5
--echo $ECHO_N "checking for working automake... $ECHO_C" >&6
++echo $ac_n "checking for working automake""... $ac_c" 1>&6
++echo "configure:757: 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.
  if (automake --version) < /dev/null > /dev/null 2>&1; then
     AUTOMAKE=automake
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
++   echo "$ac_t""found" 1>&6
  else
     AUTOMAKE="$missing_dir/missing automake"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
++   echo "$ac_t""missing" 1>&6
  fi
  
--echo "$as_me:$LINENO: checking for working autoheader" >&5
--echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
++echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
++echo "configure:770: 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.
  if (autoheader --version) < /dev/null > /dev/null 2>&1; then
     AUTOHEADER=autoheader
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
++   echo "$ac_t""found" 1>&6
  else
     AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
++   echo "$ac_t""missing" 1>&6
  fi
  
--echo "$as_me:$LINENO: checking for working makeinfo" >&5
--echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
++echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
++echo "configure:783: 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.
  if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
     MAKEINFO=makeinfo
--   echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
++   echo "$ac_t""found" 1>&6
  else
     MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$as_me:$LINENO: result: missing" >&5
--echo "${ECHO_T}missing" >&6
++   echo "$ac_t""missing" 1>&6
  fi
  
  
@@@ -1501,628 -1501,628 +796,214 @@@
  test x$prefix = "xNONE" && prefix="$ac_default_prefix"
  
  
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++# 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:803: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "gcc", so it can be a program name with args.
--set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
--fi
--
--if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="${ac_tool_prefix}cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="gcc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
  fi
  fi
--CC=$ac_cv_prog_CC
++CC="$ac_cv_prog_CC"
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  CC=$ac_ct_CC
++  echo "$ac_t""$CC" 1>&6
  else
--  CC="$ac_cv_prog_CC"
++  echo "$ac_t""no" 1>&6
  fi
  
--fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:833: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
--       ac_prog_rejected=yes
--       continue
--     fi
--    ac_cv_prog_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++        ac_prog_rejected=yes
++	continue
++      fi
++      ac_cv_prog_CC="cc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
    set dummy $ac_cv_prog_CC
    shift
--  if test $# != 0; then
++  if test $# -gt 0; then
      # We chose a different compiler from the bogus one.
      # However, it has the same basename, so the bogon will be chosen
      # first if we set CC to just the basename; use the full file name.
      shift
--    set dummy "$as_dir/$ac_word" ${1+"$@"}
++    set dummy "$ac_dir/$ac_word" "$@"
      shift
      ac_cv_prog_CC="$@"
    fi
  fi
  fi
  fi
--CC=$ac_cv_prog_CC
++CC="$ac_cv_prog_CC"
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
++  echo "$ac_t""$CC" 1>&6
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
  fi
  
--fi
--if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:884: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
  fi
  fi
--CC=$ac_cv_prog_CC
++CC="$ac_cv_prog_CC"
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
++  echo "$ac_t""$CC" 1>&6
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--    test -n "$CC" && break
--  done
++  echo "$ac_t""no" 1>&6
  fi
--if test -z "$CC"; then
--  ac_ct_CC=$CC
--  for ac_prog in cl
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
++ ;;
++    esac
    fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
--  test -n "$ac_ct_CC" && break
--done
--
--  CC=$ac_ct_CC
--fi
--
--fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:916: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
  
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
--   { (exit 1); exit 1; }; }
--
--# Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
++cat > conftest.$ac_ext << EOF
  
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++#line 927 "configure"
  #include "confdefs.h"
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe"
--# Try to create an executable without -o first, disregard a.out.
--# It will help us diagnose broken compilers, and finding out an intuition
--# of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output" >&5
--echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
--  (eval $ac_link_default) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  # Find the output, starting from the most likely.  This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
--                ls a.out conftest 2>/dev/null;
--                ls a.* conftest.* 2>/dev/null`; do
--  case $ac_file in
--    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
--    a.out ) # We found the default executable, but exeext='' is most
--            # certainly right.
--            break;;
--    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
--          export ac_cv_exeext
--          break;;
--    * ) break;;
--  esac
--done
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
--echo "$as_me: error: C compiler cannot create executables" >&2;}
--   { (exit 77); exit 77; }; }
--fi
--
--ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
--
--# Check the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--    cross_compiling=no
++main(){return(0);}
++EOF
++if { (eval echo configure:932: \"$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
++    ac_cv_prog_cc_cross=no
    else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&5
--echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&2;}
--   { (exit 1); exit 1; }; }
--    fi
++    ac_cv_prog_cc_cross=yes
    fi
--fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--rm -f a.out a.exe conftest$ac_cv_exeext
--ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  # If both `conftest.exe' and `conftest' are `present' (well, observable)
--# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
--# work properly (i.e., refer to `conftest.exe'), while it won't with
--# `rm'.
--for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
--  case $ac_file in
--    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
--    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--          export ac_cv_exeext
--          break;;
--    * ) break;;
--  esac
--done
  else
--  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
--   { (exit 1); exit 1; }; }
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_works=no
  fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
  
--rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
  
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
--if test "${ac_cv_objext+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:963: checking whether we are using GNU C" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
  #endif
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
--  case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
--    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
--       break;;
--  esac
--done
++EOF
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_gcc=yes
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
--   { (exit 1); exit 1; }; }
++  ac_cv_prog_gcc=no
  fi
--
--rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
--OBJEXT=$ac_cv_objext
--ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--#ifndef __GNUC__
--       choke me
--#endif
++echo "$ac_t""$ac_cv_prog_gcc" 1>&6
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_compiler_gnu=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_compiler_gnu=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--ac_cv_c_compiler_gnu=$ac_compiler_gnu
--
--fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
--GCC=`test $ac_compiler_gnu = yes && echo yes`
--ac_test_CFLAGS=${CFLAGS+set}
--ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++if test $ac_cv_prog_gcc = yes; then
++  GCC=yes
++else
++  GCC=
++fi
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:991: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  echo 'void f(){}' > conftest.c
++if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
    ac_cv_prog_cc_g=yes
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_prog_cc_g=no
++  ac_cv_prog_cc_g=no
  fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest*
++
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
  if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
++  CFLAGS="$ac_save_CFLAGS"
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
      CFLAGS="-g -O2"
@@@ -2136,343 -2136,343 +1017,136 @@@ els
      CFLAGS=
    fi
  fi
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <stdlib.h>
--$ac_declaration
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--continue
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--$ac_declaration
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  break
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
--fi
  
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
++do
++# Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1027: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
  else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CXX="$ac_prog"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
  fi
  fi
--CXX=$ac_cv_prog_CXX
++CXX="$ac_cv_prog_CXX"
  if test -n "$CXX"; then
--  echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
++  echo "$ac_t""$CXX" 1>&6
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
  fi
  
--    test -n "$CXX" && break
--  done
--fi
--if test -z "$CXX"; then
--  ac_ct_CXX=$CXX
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CXX"; then
--  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CXX="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
++test -n "$CXX" && break
  done
++test -n "$CXX" || CXX="gcc"
  
--fi
--fi
--ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
--if test -n "$ac_ct_CXX"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6
++
++echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:1059: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
++cat > conftest.$ac_ext << EOF
++
++#line 1070 "configure"
++#include "confdefs.h"
++
++int main(){return(0);}
++EOF
++if { (eval echo configure:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  ac_cv_prog_cxx_works=yes
++  # If we can't run a trivial program, we are probably using a cross compiler.
++  if (./conftest; exit) 2>/dev/null; then
++    ac_cv_prog_cxx_cross=no
++  else
++    ac_cv_prog_cxx_cross=yes
++  fi
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cxx_works=no
  fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
  
--  test -n "$ac_ct_CXX" && break
--done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
--
--  CXX=$ac_ct_CXX
--fi
--
--
--# Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C++ compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--
--echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
--if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
++if test $ac_cv_prog_cxx_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 ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:1101: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
++cross_compiling=$ac_cv_prog_cxx_cross
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--#ifndef __GNUC__
--       choke me
++echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
++echo "configure:1106: checking whether we are using GNU C++" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.C <<EOF
++#ifdef __GNUC__
++  yes;
  #endif
++EOF
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_gxx=yes
++else
++  ac_cv_prog_gxx=no
++fi
++fi
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_compiler_gnu=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_compiler_gnu=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
--
--fi
--echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
--GXX=`test $ac_compiler_gnu = yes && echo yes`
--ac_test_CXXFLAGS=${CXXFLAGS+set}
--ac_save_CXXFLAGS=$CXXFLAGS
--CXXFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_cxx_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
++echo "$ac_t""$ac_cv_prog_gxx" 1>&6
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++if test $ac_cv_prog_gxx = yes; then
++  GXX=yes
++else
++  GXX=
++fi
++
++ac_test_CXXFLAGS="${CXXFLAGS+set}"
++ac_save_CXXFLAGS="$CXXFLAGS"
++CXXFLAGS=
++echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
++echo "configure:1134: checking whether ${CXX-g++} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  echo 'void f(){}' > conftest.cc
++if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
    ac_cv_prog_cxx_g=yes
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_prog_cxx_g=no
++  ac_cv_prog_cxx_g=no
  fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest*
++
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
++
++echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
  if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
++  CXXFLAGS="$ac_save_CXXFLAGS"
  elif test $ac_cv_prog_cxx_g = yes; then
    if test "$GXX" = yes; then
      CXXFLAGS="-g -O2"
@@@ -2486,102 -2486,102 +1160,6 @@@ els
      CXXFLAGS=
    fi
  fi
--for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <stdlib.h>
--$ac_declaration
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--continue
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--$ac_declaration
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  break
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
--fi
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
@@@ -2590,1064 -2590,1066 +1168,491 @@@
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
--# AmigaOS /C/install, which installs bootblocks on floppy discs
  # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:1177: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
--if test "${ac_cv_path_install+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  # Account for people who put trailing slashes in PATH elements.
--case $as_dir/ in
--  ./ | .// | /cC/* | \
--  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
--  /usr/ucb/* ) ;;
--  *)
--    # OSF1 and SCO ODT 3.0 have their own names for install.
--    # Don't use installbsd from OSF since it installs stuff as root
--    # by default.
--    for ac_prog in ginstall scoinst install; do
--      for ac_exec_ext in '' $ac_executable_extensions; do
--        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
--          if test $ac_prog = install &&
--            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
--            # AIX install.  It has an incompatible calling convention.
--            :
--          elif test $ac_prog = install &&
--            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
--            # program-specific install script used by HP pwplus--don't use.
--            :
--          else
--            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--            break 3
--          fi
--        fi
-       done
-     done
-     ;;
- esac
- done
- 
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
-     # As a last resort, use the slow shell script.  We don't cache a
-     # path for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the path is relative.
-     INSTALL=$ac_install_sh
-   fi
- fi
- echo "$as_me:$LINENO: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
- for ac_prog in sed
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_regex_cmd+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$regex_cmd"; then
-   ac_cv_prog_regex_cmd="$regex_cmd" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_regex_cmd="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
- fi
- fi
- regex_cmd=$ac_cv_prog_regex_cmd
- if test -n "$regex_cmd"; then
-   echo "$as_me:$LINENO: result: $regex_cmd" >&5
- echo "${ECHO_T}$regex_cmd" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$regex_cmd" && break
- done
- 
- if test x$regex_cmd = "x"; then
-   { { echo "$as_me:$LINENO: error: error. sed is required to build the default menu file." >&5
- echo "$as_me: error: error. sed is required to build the default menu file." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
- fi
- if test -z "$CPP"; then
-   if test "${ac_cv_prog_CPP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CPP needs to be expanded
-     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-     do
-       ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-   # Use a header file that comes with gcc, so configuring glibc
-   # with a fresh cross-compiler works.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-   else
-     ac_cpp_err=
-   fi
- else
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   # Broken: fails on valid input.
- continue
- fi
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-   else
-     ac_cpp_err=
-   fi
- else
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
-   # Broken: success on invalid input.
- continue
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
-   break
- fi
- 
-     done
-     ac_cv_prog_CPP=$CPP
- 
- fi
-   CPP=$ac_cv_prog_CPP
- else
-   ac_cv_prog_CPP=$CPP
- fi
- echo "$as_me:$LINENO: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-   # Use a header file that comes with gcc, so configuring glibc
-   # with a fresh cross-compiler works.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-   else
-     ac_cpp_err=
-   fi
- else
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   # Broken: fails on valid input.
- continue
- fi
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-   else
-     ac_cpp_err=
-   fi
- else
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
-   # Broken: success on invalid input.
- continue
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then
-   :
- else
-   { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
- 
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-   else
-     ac_cpp_err=
-   fi
- else
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
-   ac_cv_header_stdc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   ac_cv_header_stdc=no
- fi
- rm -f conftest.err conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <string.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "memchr" >/dev/null 2>&1; then
-   :
- else
-   ac_cv_header_stdc=no
- fi
- rm -f conftest*
- 
- fi
- 
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "free" >/dev/null 2>&1; then
-   :
- else
-   ac_cv_header_stdc=no
- fi
- rm -f conftest*
- 
- fi
- 
- if test $ac_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-   if test "$cross_compiling" = yes; then
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
- # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-                      || ('j' <= (c) && (c) <= 'r') \
-                      || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
- #endif
- 
- #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
- int
- main ()
- {
-   int i;
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
-         || toupper (i) != TOUPPER (i))
-       exit(2);
-   exit (0);
- }
- _ACEOF
- rm -f conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define STDC_HEADERS 1
- _ACEOF
++if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
++  for ac_dir in $PATH; do
++    # Account for people who put trailing slashes in PATH elements.
++    case "$ac_dir/" in
++    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    *)
++      # OSF1 and SCO ODT 3.0 have their own names for install.
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
++        if test -f $ac_dir/$ac_prog; then
++	  if test $ac_prog = install &&
++            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  else
++	    ac_cv_path_install="$ac_dir/$ac_prog -c"
++	    break 2
++	  fi
++	fi
+       done
 -    done
 -    ;;
 -esac
 -done
 -
 -
 -fi
 -  if test "${ac_cv_path_install+set}" = set; then
 -    INSTALL=$ac_cv_path_install
 -  else
 -    # As a last resort, use the slow shell script.  We don't cache a
 -    # path for INSTALL within a source directory, because that will
 -    # break other packages using the cache if that directory is
 -    # removed, or if the path is relative.
 -    INSTALL=$ac_install_sh
 -  fi
 -fi
 -echo "$as_me:$LINENO: result: $INSTALL" >&5
 -echo "${ECHO_T}$INSTALL" >&6
 -
 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 -# It thinks the first close brace ends the variable substitution.
 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 -
 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 -
 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 -
 -
 -for ac_prog in sed
 -do
 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
 -set dummy $ac_prog; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_regex_cmd+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  if test -n "$regex_cmd"; then
 -  ac_cv_prog_regex_cmd="$regex_cmd" # Let the user override the test.
 -else
 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_regex_cmd="$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
 -done
 -
 -fi
 -fi
 -regex_cmd=$ac_cv_prog_regex_cmd
 -if test -n "$regex_cmd"; then
 -  echo "$as_me:$LINENO: result: $regex_cmd" >&5
 -echo "${ECHO_T}$regex_cmd" >&6
 -else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -fi
 -
 -  test -n "$regex_cmd" && break
 -done
 -
 -if test x$regex_cmd = "x"; then
 -  { { echo "$as_me:$LINENO: error: error. sed is required to build the default menu file." >&5
 -echo "$as_me: error: error. sed is required to build the default menu file." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -
 -
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 -# On Suns, sometimes $CPP names a directory.
 -if test -n "$CPP" && test -d "$CPP"; then
 -  CPP=
 -fi
 -if test -z "$CPP"; then
 -  if test "${ac_cv_prog_CPP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -      # Double quotes because CPP needs to be expanded
 -    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 -    do
 -      ac_preproc_ok=false
 -for ac_c_preproc_warn_flag in '' yes
 -do
 -  # Use a header file that comes with gcc, so configuring glibc
 -  # with a fresh cross-compiler works.
 -  # On the NeXT, cc -E runs the code through the compiler's parser,
 -  # not just through cpp. "Syntax error" is here to catch this case.
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <assert.h>
 -                     Syntax error
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 -  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  :
 -else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  # Broken: fails on valid input.
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <ac_nonexistent.h>
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 -  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  # Broken: success on invalid input.
 -continue
 -else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
 -  break
 -fi
 -
 -    done
 -    ac_cv_prog_CPP=$CPP
 -
 -fi
 -  CPP=$ac_cv_prog_CPP
 -else
 -  ac_cv_prog_CPP=$CPP
 -fi
 -echo "$as_me:$LINENO: result: $CPP" >&5
 -echo "${ECHO_T}$CPP" >&6
 -ac_preproc_ok=false
 -for ac_c_preproc_warn_flag in '' yes
 -do
 -  # Use a header file that comes with gcc, so configuring glibc
 -  # with a fresh cross-compiler works.
 -  # On the NeXT, cc -E runs the code through the compiler's parser,
 -  # not just through cpp. "Syntax error" is here to catch this case.
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <assert.h>
 -                     Syntax error
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 -  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  :
 -else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  # Broken: fails on valid input.
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <ac_nonexistent.h>
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 -  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  # Broken: success on invalid input.
 -continue
 -else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
 -  :
 -else
 -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
 -
 -
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 -if test "${ac_cv_header_stdc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <stdlib.h>
 -#include <stdarg.h>
 -#include <string.h>
 -#include <float.h>
 -
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 -  ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  ac_cv_header_stdc=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  ac_cv_header_stdc=no
 -fi
 -rm -f conftest.err conftest.$ac_ext
 -
 -if test $ac_cv_header_stdc = yes; then
 -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <string.h>
 -
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "memchr" >/dev/null 2>&1; then
 -  :
 -else
 -  ac_cv_header_stdc=no
 -fi
 -rm -f conftest*
 -
 -fi
 -
 -if test $ac_cv_header_stdc = yes; then
 -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <stdlib.h>
 -
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "free" >/dev/null 2>&1; then
 -  :
 -else
 -  ac_cv_header_stdc=no
 -fi
 -rm -f conftest*
 -
 -fi
 -
 -if test $ac_cv_header_stdc = yes; then
 -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 -  if test "$cross_compiling" = yes; then
 -  :
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <ctype.h>
 -#if ((' ' & 0x0FF) == 0x020)
 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 -#else
 -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
 -                     || ('j' <= (c) && (c) <= 'r') \
 -                     || ('s' <= (c) && (c) <= 'z'))
 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 -#endif
 -
 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 -int
 -main ()
 -{
 -  int i;
 -  for (i = 0; i < 256; i++)
 -    if (XOR (islower (i), ISLOWER (i))
 -        || toupper (i) != TOUPPER (i))
 -      exit(2);
 -  exit (0);
 -}
 -_ACEOF
 -rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  :
 -else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -( exit $ac_status )
 -ac_cv_header_stdc=no
 -fi
 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -fi
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -echo "${ECHO_T}$ac_cv_header_stdc" >&6
 -if test $ac_cv_header_stdc = yes; then
 -
 -cat >>confdefs.h <<\_ACEOF
 -#define STDC_HEADERS 1
 -_ACEOF
++      ;;
++    esac
++  done
++  IFS="$ac_save_IFS"
  
  fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL="$ac_cv_path_install"
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL="$ac_install_sh"
++  fi
++fi
++echo "$ac_t""$INSTALL" 1>&6
  
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
  
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
  
  
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--                  inttypes.h stdint.h unistd.h
++for ac_prog in sed
  do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--$ac_includes_default
--
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_Header=yes"
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--eval "$as_ac_Header=no"
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
++# Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1243: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_regex_cmd'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$regex_cmd"; then
++  ac_cv_prog_regex_cmd="$regex_cmd" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_regex_cmd="$ac_prog"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++regex_cmd="$ac_cv_prog_regex_cmd"
++if test -n "$regex_cmd"; then
++  echo "$ac_t""$regex_cmd" 1>&6
++else
++  echo "$ac_t""no" 1>&6
  fi
  
++test -n "$regex_cmd" && break
  done
  
++if test x$regex_cmd = "x"; then
++  { echo "configure: error: error. sed is required to build the default menu file." 1>&2; exit 1; }
++fi
  
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- for ac_header in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h
 -
 -
 -for ac_header in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_header_compiler=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--#include <$ac_header>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
++echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
++echo "configure:1277: checking how to run the C++ preprocessor" >&5
++if test -z "$CXXCPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
++  ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++  CXXCPP="${CXX-g++} -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1290 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
  else
--  echo "$as_me: failed program was:" >&5
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
--  ac_header_preproc=no
++  rm -rf conftest*
++  CXXCPP=/lib/cpp
  fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc in
--  yes:no )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
--  no:yes )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
--esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  eval "$as_ac_Header=$ac_header_preproc"
++rm -f conftest*
++  ac_cv_prog_CXXCPP="$CXXCPP"
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--
  fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
++CXXCPP="$ac_cv_prog_CXXCPP"
++echo "$ac_t""$CXXCPP" 1>&6
  
++for ac_hdr in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h sstream
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:1323: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1328 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
  fi
--
  done
  
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
--if test "${ac_cv_header_time+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
++echo "configure:1360: checking whether time.h and sys/time.h may both be included" >&5
++if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 1365 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
  #include <time.h>
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--if ((struct tm *) 0)
--return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++int main() {
++struct tm *tp;
++; return 0; }
++EOF
++if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
    ac_cv_header_time=yes
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_header_time=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_header_time=no
  fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest*
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
--if test $ac_cv_header_time = yes; then
  
--cat >>confdefs.h <<\_ACEOF
++echo "$ac_t""$ac_cv_header_time" 1>&6
++if test $ac_cv_header_time = yes; then
++  cat >> confdefs.h <<\EOF
  #define TIME_WITH_SYS_TIME 1
--_ACEOF
++EOF
  
  fi
  
  
--
  for ac_func in basename
  do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:1398: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1403 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
++    which can conflict with char $ac_func(); below.  */
  #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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) ();
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #else
--f = $ac_func;
++$ac_func();
  #endif
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--eval "$as_ac_var=no"
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--else
--  echo "$as_me:$LINENO: checking for basename in -lgen" >&5
--echo $ECHO_N "checking for basename in -lgen... $ECHO_C" >&6
--if test "${ac_cv_lib_gen_basename+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++; return 0; }
++EOF
++if { (eval echo configure:1429: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for basename in -lgen""... $ac_c" 1>&6
++echo "configure:1451: checking for basename in -lgen" >&5
++ac_lib_var=`echo gen'_'basename | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
  LIBS="-lgen  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 1459 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char basename ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--basename ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_gen_basename=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_gen_basename=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gen_basename" >&5
--echo "${ECHO_T}$ac_cv_lib_gen_basename" >&6
--if test $ac_cv_lib_gen_basename = yes; then
--  cat >>confdefs.h <<\_ACEOF
++    builtin and then its argument prototype would still apply.  */
++char basename();
++
++int main() {
++basename()
++; return 0; }
++EOF
++if { (eval echo configure:1473: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  cat >> confdefs.h <<\EOF
  #define HAVE_BASENAME 1
--_ACEOF
++EOF
   LIBS="$LIBS -lgen"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
  fi
  done
  
--
--
--
--
--
--
--
--
--
--
  for ac_func in getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose
  do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:1502: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1507 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
++    which can conflict with char $ac_func(); below.  */
  #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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) ();
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #else
--f = $ac_func;
++$ac_func();
  #endif
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--eval "$as_ac_var=no"
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
++; return 0; }
++EOF
++if { (eval echo configure:1533: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
  
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
  fi
  done
  
--echo "$as_me:$LINENO: checking for t_open in -lnsl" >&5
--echo $ECHO_N "checking for t_open in -lnsl... $ECHO_C" >&6
--if test "${ac_cv_lib_nsl_t_open+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
++echo "configure:1558: checking for t_open in -lnsl" >&5
++ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 1566 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char t_open ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--t_open ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_nsl_t_open=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_nsl_t_open=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_t_open" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_t_open" >&6
--if test $ac_cv_lib_nsl_t_open = yes; then
++    builtin and then its argument prototype would still apply.  */
++char t_open();
++
++int main() {
++t_open()
++; return 0; }
++EOF
++if { (eval echo configure:1580: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    LIBS="$LIBS -lnsl"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
--echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
--echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
--if test "${ac_cv_lib_socket_socket+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
++echo "configure:1601: checking for socket in -lsocket" >&5
++ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 1609 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char socket ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--socket ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_socket_socket=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_socket_socket=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
--if test $ac_cv_lib_socket_socket = yes; then
--  LIBS="$LIBS -lsocket"
++    builtin and then its argument prototype would still apply.  */
++char socket();
++
++int main() {
++socket()
++; return 0; }
++EOF
++if { (eval echo configure:1623: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
  fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
  
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  LIBS="$LIBS -lsocket"
++else
++  echo "$ac_t""no" 1>&6
++fi
  
--echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
  
++# If we find X, set shell vars x_includes and x_libraries to the
++# paths, otherwise set no_x=yes.
++# 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:1649: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
    withval="$with_x"
++  :
++fi
  
--fi;
  # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
  if test "x$with_x" = xno; then
    # The user explicitly disabled X.
@@@ -3657,180 -3659,180 +1662,193 @@@ els
      # Both variables are already set.
      have_x=yes
    else
--    if test "${ac_cv_have_x+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++if eval "test \"`echo '$''{'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.
--ac_x_includes=no ac_x_libraries=no
--rm -fr conftest.dir
--if mkdir conftest.dir; then
--  cd conftest.dir
++ac_x_includes=NO ac_x_libraries=NO
++rm -fr conftestdir
++if mkdir conftestdir; then
++  cd conftestdir
    # Make sure to not put "make" in the Imakefile rules, since we grep it out.
--  cat >Imakefile <<'_ACEOF'
++  cat > Imakefile <<'EOF'
  acfindx:
  	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
--_ACEOF
++EOF
    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
      # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
      eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
      # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
      for ac_extension in a so sl; do
        if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
--         test -f $ac_im_libdir/libX11.$ac_extension; then
++        test -f $ac_im_libdir/libX11.$ac_extension; then
          ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
      # Screen out bogus values from the imake configuration.  They are
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
--    case $ac_im_incroot in
++    case "$ac_im_incroot" in
  	/usr/include) ;;
--	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
++	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
      esac
--    case $ac_im_usrlibdir in
++    case "$ac_im_usrlibdir" in
  	/usr/lib | /lib) ;;
--	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
++	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
      esac
    fi
    cd ..
--  rm -fr conftest.dir
++  rm -fr conftestdir
  fi
  
--# Standard set of common directories for X headers.
--# Check X11 before X11Rn because it is often a symlink to the current release.
--ac_x_header_dirs='
--/usr/X11/include
--/usr/X11R6/include
--/usr/X11R5/include
--/usr/X11R4/include
--
--/usr/include/X11
--/usr/include/X11R6
--/usr/include/X11R5
--/usr/include/X11R4
--
--/usr/local/X11/include
--/usr/local/X11R6/include
--/usr/local/X11R5/include
--/usr/local/X11R4/include
--
--/usr/local/include/X11
--/usr/local/include/X11R6
--/usr/local/include/X11R5
--/usr/local/include/X11R4
--
--/usr/X386/include
--/usr/x386/include
--/usr/XFree86/include/X11
--
--/usr/include
--/usr/local/include
--/usr/unsupported/include
--/usr/athena/include
--/usr/local/x11r5/include
--/usr/lpp/Xamples/include
--
--/usr/openwin/include
--/usr/openwin/share/include'
--
--if test "$ac_x_includes" = no; then
--  # Guess where to find include files, by looking for Intrinsic.h.
++if test "$ac_x_includes" = NO; then
++  # Guess where to find include files, by looking for this one X11 .h file.
++  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
++
    # First, try using that file with no special directory specified.
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 1711 "configure"
  #include "confdefs.h"
--#include <X11/Intrinsic.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
++#include <$x_direct_test_include>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1716: \"$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*
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
--  echo "$as_me: failed program was:" >&5
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
--  for ac_dir in $ac_x_header_dirs; do
--  if test -r "$ac_dir/X11/Intrinsic.h"; then
--    ac_x_includes=$ac_dir
--    break
--  fi
--done
++  rm -rf conftest*
++  # Look for the header file in a standard set of common directories.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++  for ac_dir in               \
++    /usr/X11/include          \
++    /usr/X11R6/include        \
++    /usr/X11R5/include        \
++    /usr/X11R4/include        \
++                              \
++    /usr/include/X11          \
++    /usr/include/X11R6        \
++    /usr/include/X11R5        \
++    /usr/include/X11R4        \
++                              \
++    /usr/local/X11/include    \
++    /usr/local/X11R6/include  \
++    /usr/local/X11R5/include  \
++    /usr/local/X11R4/include  \
++                              \
++    /usr/local/include/X11    \
++    /usr/local/include/X11R6  \
++    /usr/local/include/X11R5  \
++    /usr/local/include/X11R4  \
++                              \
++    /usr/X386/include         \
++    /usr/x386/include         \
++    /usr/XFree86/include/X11  \
++                              \
++    /usr/include              \
++    /usr/local/include        \
++    /usr/unsupported/include  \
++    /usr/athena/include       \
++    /usr/local/x11r5/include  \
++    /usr/lpp/Xamples/include  \
++                              \
++    /usr/openwin/include      \
++    /usr/openwin/share/include \
++    ; \
++  do
++    if test -r "$ac_dir/$x_direct_test_include"; then
++      ac_x_includes=$ac_dir
++      break
++    fi
++  done
  fi
--rm -f conftest.err conftest.$ac_ext
--fi # $ac_x_includes = no
++rm -f conftest*
++fi # $ac_x_includes = NO
  
--if test "$ac_x_libraries" = no; then
++if test "$ac_x_libraries" = NO; then
    # Check for the libraries.
++
++  test -z "$x_direct_test_library" && x_direct_test_library=Xt
++  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
++
    # See if we find them without any special options.
    # Don't add to $LIBS permanently.
--  ac_save_LIBS=$LIBS
--  LIBS="-lXt $LIBS"
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  ac_save_LIBS="$LIBS"
++  LIBS="-l$x_direct_test_library $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1785 "configure"
  #include "confdefs.h"
--#include <X11/Intrinsic.h>
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--XtMalloc (0)
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  LIBS=$ac_save_LIBS
++
++int main() {
++${x_direct_test_function}()
++; return 0; }
++EOF
++if { (eval echo configure:1792: \"$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.
  ac_x_libraries=
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--LIBS=$ac_save_LIBS
--for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  LIBS="$ac_save_LIBS"
++# First see if replacing the include by lib works.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
++    /usr/X11/lib          \
++    /usr/X11R6/lib        \
++    /usr/X11R5/lib        \
++    /usr/X11R4/lib        \
++                          \
++    /usr/lib/X11          \
++    /usr/lib/X11R6        \
++    /usr/lib/X11R5        \
++    /usr/lib/X11R4        \
++                          \
++    /usr/local/X11/lib    \
++    /usr/local/X11R6/lib  \
++    /usr/local/X11R5/lib  \
++    /usr/local/X11R4/lib  \
++                          \
++    /usr/local/lib/X11    \
++    /usr/local/lib/X11R6  \
++    /usr/local/lib/X11R5  \
++    /usr/local/lib/X11R4  \
++                          \
++    /usr/X386/lib         \
++    /usr/x386/lib         \
++    /usr/XFree86/lib/X11  \
++                          \
++    /usr/lib              \
++    /usr/local/lib        \
++    /usr/unsupported/lib  \
++    /usr/athena/lib       \
++    /usr/local/x11r5/lib  \
++    /usr/lpp/Xamples/lib  \
++    /lib/usr/lib/X11	  \
++                          \
++    /usr/openwin/lib      \
++    /usr/openwin/share/lib \
++    ; \
  do
--  # Don't even attempt the hair of trying to link an X program!
    for ac_extension in a so sl; do
--    if test -r $ac_dir/libXt.$ac_extension; then
++    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
        ac_x_libraries=$ac_dir
        break 2
      fi
    done
  done
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi # $ac_x_libraries = no
++rm -f conftest*
++fi # $ac_x_libraries = NO
  
--if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
++if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
    # Didn't find X anywhere.  Cache the known absence of X.
    ac_cv_have_x="have_x=no"
  else
@@@ -3839,14 -3841,14 +1857,12 @@@
  	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
  fi
  fi
--
    fi
    eval "$ac_cv_have_x"
  fi # $with_x != no
  
  if test "$have_x" != yes; then
--  echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
++  echo "$ac_t""$have_x" 1>&6
    no_x=yes
  else
    # If each of the values was on the command line, it overrides each guess.
@@@ -3855,16 -3857,16 +1871,14 @@@
    # Update the cache value to reflect the command line values.
    ac_cv_have_x="have_x=yes \
  		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
--  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
++  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
  fi
  
  if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
--
--cat >>confdefs.h <<\_ACEOF
++  cat >> confdefs.h <<\EOF
  #define X_DISPLAY_MISSING 1
--_ACEOF
++EOF
  
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
@@@ -3877,101 -3879,101 +1891,60 @@@
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
--    case `(uname -sr) 2>/dev/null` in
++    case "`(uname -sr) 2>/dev/null`" in
      "SunOS 5"*)
--      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
--echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
--      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
--      cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
++echo "configure:1898: 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 1901 "configure"
  #include "confdefs.h"
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
    ac_R_nospace=yes
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_R_nospace=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_R_nospace=no
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest*
        if test $ac_R_nospace = yes; then
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++	echo "$ac_t""no" 1>&6
  	X_LIBS="$X_LIBS -R$x_libraries"
        else
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
--	cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++	cat > conftest.$ac_ext <<EOF
++#line 1924 "configure"
  #include "confdefs.h"
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:1931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
    ac_R_space=yes
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_R_space=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_R_space=no
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest*
  	if test $ac_R_space = yes; then
--	  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++	  echo "$ac_t""yes" 1>&6
  	  X_LIBS="$X_LIBS -R $x_libraries"
  	else
--	  echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6
++	  echo "$ac_t""neither works" 1>&6
  	fi
        fi
--      LIBS=$ac_xsave_LIBS
++      LIBS="$ac_xsave_LIBS"
      esac
    fi
  
@@@ -3982,838 -3984,838 +1955,560 @@@
    if test "$ISC" = yes; then
      X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
    else
--    # Martyn Johnson says this is needed for Ultrix, if the X
--    # libraries were built with DECnet support.  And Karl Berry says
++    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
++    # libraries were built with DECnet support.  And karl@cs.umb.edu says
      # the Alpha needs dnet_stub (dnet does not exist).
--    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char XOpenDisplay ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--XOpenDisplay ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
++    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
++echo "configure:1963: checking for dnet_ntoa in -ldnet" >&5
++ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
--if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-ldnet  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 1971 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dnet_ntoa ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--dnet_ntoa ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dnet_dnet_ntoa=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_dnet_dnet_ntoa=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
--if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
++    builtin and then its argument prototype would still apply.  */
++char dnet_ntoa();
++
++int main() {
++dnet_ntoa()
++; return 0; }
++EOF
++if { (eval echo configure:1985: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
--if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
++echo "configure:2007: checking for dnet_ntoa in -ldnet_stub" >&5
++ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2015 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dnet_ntoa ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--dnet_ntoa ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dnet_stub_dnet_ntoa=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_dnet_stub_dnet_ntoa=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
--if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
++    builtin and then its argument prototype would still apply.  */
++char dnet_ntoa();
++
++int main() {
++dnet_ntoa()
++; return 0; }
++EOF
++if { (eval echo configure:2029: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
      fi
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--    LIBS="$ac_xsave_LIBS"
  
      # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
      # to get the SysV transport functions.
--    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
++    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
      # needs -lnsl.
      # The nsl library prevents programs from opening the X display
--    # on Irix 5.2, according to T.E. Dickey.
--    # The functions gethostbyname, getservbyname, and inet_addr are
--    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
--    echo "$as_me:$LINENO: checking for gethostbyname" >&5
--echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
--if test "${ac_cv_func_gethostbyname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++    # on Irix 5.2, according to dickey@clark.net.
++    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
++echo "configure:2058: checking for gethostbyname" >&5
++if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2063 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char gethostbyname (); below.  */
++    which can conflict with char gethostbyname(); below.  */
  #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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) ();
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++    builtin and then its argument prototype would still apply.  */
++char gethostbyname();
++
++int main() {
++
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
  choke me
  #else
--f = gethostbyname;
++gethostbyname();
  #endif
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_gethostbyname=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_func_gethostbyname=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
++; return 0; }
++EOF
++if { (eval echo configure:2089: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_gethostbyname=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
  
      if test $ac_cv_func_gethostbyname = no; then
--      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
--if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
++echo "configure:2110: checking for gethostbyname in -lnsl" >&5
++ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2118 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char gethostbyname ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--gethostbyname ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_nsl_gethostbyname=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_nsl_gethostbyname=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
--if test $ac_cv_lib_nsl_gethostbyname = yes; then
--  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
++    builtin and then its argument prototype would still apply.  */
++char gethostbyname();
++
++int main() {
++gethostbyname()
++; return 0; }
++EOF
++if { (eval echo configure:2132: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
  fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
  
--      if test $ac_cv_lib_nsl_gethostbyname = no; then
--        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
--if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbsd  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char gethostbyname ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--gethostbyname ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_bsd_gethostbyname=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_bsd_gethostbyname=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
--if test $ac_cv_lib_bsd_gethostbyname = yes; then
--  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
++  echo "$ac_t""no" 1>&6
  fi
  
--      fi
      fi
  
      # lieder@skyler.mavd.honeywell.com says without -lsocket,
      # socket/setsockopt and other routines are undefined under SCO ODT
      # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
--    # on later versions), says Simon Leinen: it contains gethostby*
--    # variants that don't use the nameserver (or something).  -lsocket
--    # must be given before -lnsl if both are needed.  We assume that
--    # if connect needs -lnsl, so does gethostbyname.
--    echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
--if test "${ac_cv_func_connect+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++    # on later versions), says simon@lia.di.epfl.ch: it contains
++    # gethostby* variants that don't use the nameserver (or something).
++    # -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:2162: checking for connect" >&5
++if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2167 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char connect (); below.  */
++    which can conflict with char connect(); below.  */
  #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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) ();
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++    builtin and then its argument prototype would still apply.  */
++char connect();
++
++int main() {
++
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_connect) || defined (__stub___connect)
  choke me
  #else
--f = connect;
++connect();
  #endif
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_connect=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_func_connect=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6
++; return 0; }
++EOF
++if { (eval echo configure:2193: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_connect=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
  
      if test $ac_cv_func_connect = no; then
--      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
--if test "${ac_cv_lib_socket_connect+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
++echo "configure:2214: checking for connect in -lsocket" >&5
++ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2222 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char connect ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--connect ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_socket_connect=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_socket_connect=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
--if test $ac_cv_lib_socket_connect = yes; then
++    builtin and then its argument prototype would still apply.  */
++char connect();
++
++int main() {
++connect()
++; return 0; }
++EOF
++if { (eval echo configure:2236: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
      fi
  
--    # Guillermo Gomez says -lposix is necessary on A/UX.
--    echo "$as_me:$LINENO: checking for remove" >&5
--echo $ECHO_N "checking for remove... $ECHO_C" >&6
--if test "${ac_cv_func_remove+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
++    echo $ac_n "checking for remove""... $ac_c" 1>&6
++echo "configure:2260: checking for remove" >&5
++if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2265 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char remove (); below.  */
++    which can conflict with char remove(); below.  */
  #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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) ();
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++    builtin and then its argument prototype would still apply.  */
++char remove();
++
++int main() {
++
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_remove) || defined (__stub___remove)
  choke me
  #else
--f = remove;
++remove();
  #endif
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_remove=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_func_remove=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6
++; return 0; }
++EOF
++if { (eval echo configure:2291: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_remove=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
  
      if test $ac_cv_func_remove = no; then
--      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
--if test "${ac_cv_lib_posix_remove+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
++echo "configure:2312: checking for remove in -lposix" >&5
++ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lposix  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2320 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char remove ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--remove ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_posix_remove=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_posix_remove=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
--if test $ac_cv_lib_posix_remove = yes; then
++    builtin and then its argument prototype would still apply.  */
++char remove();
++
++int main() {
++remove()
++; return 0; }
++EOF
++if { (eval echo configure:2334: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    echo "$as_me:$LINENO: checking for shmat" >&5
--echo $ECHO_N "checking for shmat... $ECHO_C" >&6
--if test "${ac_cv_func_shmat+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++    echo $ac_n "checking for shmat""... $ac_c" 1>&6
++echo "configure:2358: checking for shmat" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2363 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shmat (); below.  */
++    which can conflict with char shmat(); below.  */
  #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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) ();
--
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++    builtin and then its argument prototype would still apply.  */
++char shmat();
++
++int main() {
++
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_shmat) || defined (__stub___shmat)
  choke me
  #else
--f = shmat;
++shmat();
  #endif
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_shmat=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_func_shmat=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6
++; return 0; }
++EOF
++if { (eval echo configure:2389: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shmat=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
  
      if test $ac_cv_func_shmat = no; then
--      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
--if test "${ac_cv_lib_ipc_shmat+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
++echo "configure:2410: checking for shmat in -lipc" >&5
++ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lipc  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2418 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shmat ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--shmat ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_ipc_shmat=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_ipc_shmat=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
--if test $ac_cv_lib_ipc_shmat = yes; then
++    builtin and then its argument prototype would still apply.  */
++char shmat();
++
++int main() {
++shmat()
++; return 0; }
++EOF
++if { (eval echo configure:2432: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
      fi
    fi
  
    # Check for libraries that X11R6 Xt/Xaw programs need.
--  ac_save_LDFLAGS=$LDFLAGS
++  ac_save_LDFLAGS="$LDFLAGS"
    test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
    # check for ICE first), but we must link in the order -lSM -lICE or
    # we get undefined symbols.  So assume we have SM if we have ICE.
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
--  # John Interrante, Karl Berry
--  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
--if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
++  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
++echo "configure:2465: checking for IceConnectionNumber in -lICE" >&5
++ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2473 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char IceConnectionNumber ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--IceConnectionNumber ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_ICE_IceConnectionNumber=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_ICE_IceConnectionNumber=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
--if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
++    builtin and then its argument prototype would still apply.  */
++char IceConnectionNumber();
++
++int main() {
++IceConnectionNumber()
++; return 0; }
++EOF
++if { (eval echo configure:2487: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
--  LDFLAGS=$ac_save_LDFLAGS
++  LDFLAGS="$ac_save_LDFLAGS"
  
  fi
  
  
--test x$no_x = "xyes" && { { echo "$as_me:$LINENO: error: Openbox requires the X Window System libraries and headers." >&5
--echo "$as_me: error: Openbox requires the X Window System libraries and headers." >&2;}
--   { (exit 1); exit 1; }; }
++test x$no_x = "xyes" && { echo "configure: error: Openbox requires the X Window System libraries and headers." 1>&2; exit 1; }
  
  test x$x_includes = "x" && x_includes="/usr/include"
  test x$x_libraries = "x" && x_libraries="/usr/lib"
@@@ -4823,67 -4825,67 +2518,48 @@@ CXXFLAGS="$CXXFLAGS $X_CFLAGS
  LIBS="$LIBS $X_LIBS"
  LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
  
--echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
--echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
--if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
++echo "configure:2523: checking for XOpenDisplay in -lX11" >&5
++ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lX11  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2531 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char XOpenDisplay ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--XOpenDisplay ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_X11_XOpenDisplay=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_X11_XOpenDisplay=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
--echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
--if test $ac_cv_lib_X11_XOpenDisplay = yes; then
++    builtin and then its argument prototype would still apply.  */
++char XOpenDisplay();
++
++int main() {
++XOpenDisplay()
++; return 0; }
++EOF
++if { (eval echo configure:2545: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    LIBS="$LIBS -lX11"
  else
--  { { echo "$as_me:$LINENO: error: Could not find XOpenDisplay in -lX11." >&5
--echo "$as_me: error: Could not find XOpenDisplay in -lX11." >&2;}
--   { (exit 1); exit 1; }; }
++  echo "$ac_t""no" 1>&6
++{ echo "configure: error: Could not find XOpenDisplay in -lX11." 1>&2; exit 1; }
  
  fi
  
@@@ -4893,380 -4895,380 +2569,306 @@@ LIBS="$LIBS $X_EXTRA_LIBS
  Xext_lib=""
  
  SHAPE=""
--echo "$as_me:$LINENO: checking whether to build support for the XShape extension" >&5
--echo $ECHO_N "checking whether to build support for the XShape extension... $ECHO_C" >&6
++echo $ac_n "checking whether to build support for the XShape extension""... $ac_c" 1>&6
++echo "configure:2574: checking whether to build support for the XShape extension" >&5
  # Check whether --enable-shape or --disable-shape was given.
  if test "${enable_shape+set}" = set; then
    enableval="$enable_shape"
++  :
++fi
  
--fi;
  
  : ${enableval="yes"}
  if test x$enableval = "xyes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--  echo "$as_me:$LINENO: checking for XShapeCombineShape in -lXext" >&5
--echo $ECHO_N "checking for XShapeCombineShape in -lXext... $ECHO_C" >&6
--if test "${ac_cv_lib_Xext_XShapeCombineShape+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
++  echo "$ac_t""yes" 1>&6
++  echo $ac_n "checking for XShapeCombineShape in -lXext""... $ac_c" 1>&6
++echo "configure:2586: checking for XShapeCombineShape in -lXext" >&5
++ac_lib_var=`echo Xext'_'XShapeCombineShape | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
  LIBS="-lXext  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2594 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char XShapeCombineShape ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--XShapeCombineShape ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_Xext_XShapeCombineShape=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_Xext_XShapeCombineShape=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeCombineShape" >&5
--echo "${ECHO_T}$ac_cv_lib_Xext_XShapeCombineShape" >&6
--if test $ac_cv_lib_Xext_XShapeCombineShape = yes; then
--  echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
--echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++    builtin and then its argument prototype would still apply.  */
++char XShapeCombineShape();
++
++int main() {
++XShapeCombineShape()
++; return 0; }
++EOF
++if { (eval echo configure:2608: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
++echo "configure:2624: checking for X11/extensions/shape.h" >&5
++    cat > conftest.$ac_ext <<EOF
++#line 2626 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
  #include <X11/extensions/shape.h>
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++int main() {
  long foo = ShapeSet
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++; return 0; }
++EOF
++if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  echo "$ac_t""yes" 1>&6
        SHAPE="-DSHAPE"; Xext_lib="-lXext"
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  echo "$ac_t""no" 1>&6
++    
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--
++rm -f conftest*
++  
++else
++  echo "$ac_t""no" 1>&6
  fi
  
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
  fi
  
  
  LIBS="$LIBS $Xext_lib"
  
  SLIT=""
--echo "$as_me:$LINENO: checking whether to include the Slit" >&5
--echo $ECHO_N "checking whether to include the Slit... $ECHO_C" >&6
++echo $ac_n "checking whether to include the Slit""... $ac_c" 1>&6
++echo "configure:2662: checking whether to include the Slit" >&5
  # Check whether --enable-slit or --disable-slit was given.
  if test "${enable_slit+set}" = set; then
    enableval="$enable_slit"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++    echo "$ac_t""yes" 1>&6
      SLIT="-DSLIT"
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6
    fi
  else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++  echo "$ac_t""yes" 1>&6
    SLIT="-DSLIT"
  
--fi;
++fi
++
  
  
  NEWWMSPEC=""
--echo "$as_me:$LINENO: checking whether to include the new WM Spec (DOES NOTHING)" >&5
--echo $ECHO_N "checking whether to include the new WM Spec (DOES NOTHING)... $ECHO_C" >&6
++echo $ac_n "checking whether to include the new WM Spec (DOES NOTHING)""... $ac_c" 1>&6
++echo "configure:2682: checking whether to include the new WM Spec (DOES NOTHING)" >&5
  # Check whether --enable-newspec or --disable-newspec was given.
  if test "${enable_newspec+set}" = set; then
    enableval="$enable_newspec"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--    NEWWMSPEC="-DNEWWMSPEC"
++    echo "$ac_t""yes" 1>&6
++    NEWWMSPEC="-DNEWWMSPEC"   
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6
    fi
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
++
++fi
  
--fi;
  
  
  
  INTERLACE=""
--echo "$as_me:$LINENO: checking whether to include interlacing image code" >&5
--echo $ECHO_N "checking whether to include interlacing image code... $ECHO_C" >&6
++echo $ac_n "checking whether to include interlacing image code""... $ac_c" 1>&6
++echo "configure:2702: checking whether to include interlacing image code" >&5
  # Check whether --enable-interlace or --disable-interlace was given.
  if test "${enable_interlace+set}" = set; then
    enableval="$enable_interlace"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++    echo "$ac_t""yes" 1>&6
      INTERLACE="-DINTERLACE"
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6
    fi
  else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++  echo "$ac_t""yes" 1>&6
    INTERLACE="-DINTERLACE"
  
--fi;
++fi
++
  
  
  ORDEREDPSEUDO=""
--echo "$as_me:$LINENO: checking whether to include Pseudocolor ordered dithering code" >&5
--echo $ECHO_N "checking whether to include Pseudocolor ordered dithering code... $ECHO_C" >&6
++echo $ac_n "checking whether to include Pseudocolor ordered dithering code""... $ac_c" 1>&6
++echo "configure:2722: checking whether to include Pseudocolor ordered dithering code" >&5
  # Check whether --enable-ordered-pseudo or --disable-ordered-pseudo was given.
  if test "${enable_ordered_pseudo+set}" = set; then
    enableval="$enable_ordered_pseudo"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--    ORDEREDPSEUDO="-DORDEREDPSEUDO"
++    echo "$ac_t""yes" 1>&6
++    ORDEREDPSEUDO="-DORDEREDPSEUDO" 
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6 
    fi
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
++
++fi
  
--fi;
  
  
  CLOBBER=""
--echo "$as_me:$LINENO: checking whether to intercept mouse events to clients" >&5
--echo $ECHO_N "checking whether to intercept mouse events to clients... $ECHO_C" >&6
++echo $ac_n "checking whether to intercept mouse events to clients""... $ac_c" 1>&6
++echo "configure:2741: checking whether to intercept mouse events to clients" >&5
  # Check whether --enable-clobber or --disable-clobber was given.
  if test "${enable_clobber+set}" = set; then
    enableval="$enable_clobber"
    if test x$enableval = "xno"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    CLOBBER="-DNOCLOBBER"
++    echo "$ac_t""no" 1>&6
++    CLOBBER="-DNOCLOBBER" 
    else
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++    echo "$ac_t""yes" 1>&6 
    fi
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
++
++fi
  
--fi;
  
  
  DEBUG=""
--echo "$as_me:$LINENO: checking whether to include verbose debugging code" >&5
--echo $ECHO_N "checking whether to include verbose debugging code... $ECHO_C" >&6
++echo $ac_n "checking whether to include verbose debugging code""... $ac_c" 1>&6
++echo "configure:2760: checking whether to include verbose debugging code" >&5
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
    enableval="$enable_debug"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++    echo "$ac_t""yes" 1>&6
      DEBUG="-DDEBUG"
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6
    fi
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
++
++fi
  
--fi;
  
  
  NLS=""
--echo "$as_me:$LINENO: checking whether to include NLS support" >&5
--echo $ECHO_N "checking whether to include NLS support... $ECHO_C" >&6
++echo $ac_n "checking whether to include NLS support""... $ac_c" 1>&6
++echo "configure:2779: checking whether to include NLS support" >&5
  # Check whether --enable-nls or --disable-nls was given.
  if test "${enable_nls+set}" = set; then
    enableval="$enable_nls"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++    echo "$ac_t""yes" 1>&6
      NLS="-DNLS"
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6
    fi
  else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++  echo "$ac_t""yes" 1>&6
    NLS="-DNLS"
  
--fi;
++fi
++
  
  
--echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
--echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6
--if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6
++echo "configure:2798: checking for setlocale in -lxpg4" >&5
++ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  ac_check_lib_save_LIBS=$LIBS
++  ac_save_LIBS="$LIBS"
  LIBS="-lxpg4  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++cat > conftest.$ac_ext <<EOF
++#line 2806 "configure"
  #include "confdefs.h"
--
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char setlocale ();
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
--setlocale ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_xpg4_setlocale=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_xpg4_setlocale=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
--echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6
--if test $ac_cv_lib_xpg4_setlocale = yes; then
++    builtin and then its argument prototype would still apply.  */
++char setlocale();
++
++int main() {
++setlocale()
++; return 0; }
++EOF
++if { (eval echo configure:2820: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
    LIBS="$LIBS -lxpg4"
++else
++  echo "$ac_t""no" 1>&6
  fi
  
  
  for ac_prog in gencat
  do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
++# Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_gencat_cmd+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2846: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gencat_cmd'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$gencat_cmd"; then
    ac_cv_prog_gencat_cmd="$gencat_cmd" # Let the user override the test.
  else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_gencat_cmd="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_gencat_cmd="$ac_prog"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
  fi
  fi
--gencat_cmd=$ac_cv_prog_gencat_cmd
++gencat_cmd="$ac_cv_prog_gencat_cmd"
  if test -n "$gencat_cmd"; then
--  echo "$as_me:$LINENO: result: $gencat_cmd" >&5
--echo "${ECHO_T}$gencat_cmd" >&6
++  echo "$ac_t""$gencat_cmd" 1>&6
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
  fi
  
--  test -n "$gencat_cmd" && break
++test -n "$gencat_cmd" && break
  done
  
  if test x$gencat_cmd = "x"; then
@@@ -5275,39 -5277,39 +2877,37 @@@ f
  
  
  TIMEDCACHE=""
--echo "$as_me:$LINENO: checking whether to use the new timed pixmap cache" >&5
--echo $ECHO_N "checking whether to use the new timed pixmap cache... $ECHO_C" >&6
++echo $ac_n "checking whether to use the new timed pixmap cache""... $ac_c" 1>&6
++echo "configure:2882: checking whether to use the new timed pixmap cache" >&5
  # Check whether --enable-timed-cache or --disable-timed-cache was given.
  if test "${enable_timed_cache+set}" = set; then
    enableval="$enable_timed_cache"
    if test x$enableval = "xyes"; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++    echo "$ac_t""yes" 1>&6
      TIMEDCACHE="-DTIMEDCACHE"
    else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++    echo "$ac_t""no" 1>&6
    fi
  else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
++  echo "$ac_t""yes" 1>&6
    TIMEDCACHE="-DTIMEDCACHE"
  
--fi;
++fi
++
  
  
--echo "$as_me:$LINENO: checking return type of signal handlers" >&5
--echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
--if test "${ac_cv_type_signal+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
++echo "configure:2901: checking return type of signal handlers" >&5
++if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 2906 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
  #ifdef signal
--# undef signal
++#undef signal
  #endif
  #ifdef __cplusplus
  extern "C" void (*signal (int, void (*)(int)))(int);
@@@ -5315,61 -5317,61 +2915,41 @@@
  void (*signal ()) ();
  #endif
  
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
--int
--main ()
--{
++int main() {
  int i;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++; return 0; }
++EOF
++if { (eval echo configure:2923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
    ac_cv_type_signal=void
  else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_type_signal=int
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_type_signal=int
  fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest*
  fi
--echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6
  
--cat >>confdefs.h <<_ACEOF
++echo "$ac_t""$ac_cv_type_signal" 1>&6
++cat >> confdefs.h <<EOF
  #define RETSIGTYPE $ac_cv_type_signal
--_ACEOF
++EOF
  
  
  
--echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
++echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
++echo "configure:2943: checking whether to enable maintainer-specific portions of Makefiles" >&5
      # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
  if test "${enable_maintainer_mode+set}" = set; then
    enableval="$enable_maintainer_mode"
    USE_MAINTAINER_MODE=$enableval
  else
    USE_MAINTAINER_MODE=no
--fi;
--  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
  
++  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
++  
  
  if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
@@@ -5379,1161 -5381,1161 +2959,448 @@@ els
    MAINTAINER_MODE_FALSE=
  fi
    MAINT=$MAINTAINER_MODE_TRUE
++  
  
  
++echo "$ac_t""" 1>&6
++echo "$ac_t""	$PACKAGE version $VERSION configured successfully." 1>&6
++echo "$ac_t""" 1>&6
++echo "$ac_t""Using '$prefix' for installation." 1>&6
++echo "$ac_t""Using '$CXX' for C++ compiler." 1>&6
++echo "$ac_t""Building with '$CXXFLAGS' for C++ compiler flags." 1>&6
++echo "$ac_t""Building with '$LIBS' for linker flags." 1>&6
++echo "$ac_t""" 1>&6
  
--echo "$as_me:$LINENO: result: " >&5
--echo "${ECHO_T}" >&6
--echo "$as_me:$LINENO: result: 	$PACKAGE version $VERSION configured successfully." >&5
--echo "${ECHO_T}	$PACKAGE version $VERSION configured successfully." >&6
--echo "$as_me:$LINENO: result: " >&5
--echo "${ECHO_T}" >&6
--echo "$as_me:$LINENO: result: Using '$prefix' for installation." >&5
--echo "${ECHO_T}Using '$prefix' for installation." >&6
--echo "$as_me:$LINENO: result: Using '$CXX' for C++ compiler." >&5
--echo "${ECHO_T}Using '$CXX' for C++ compiler." >&6
--echo "$as_me:$LINENO: result: Building with '$CXXFLAGS' for C++ compiler flags." >&5
--echo "${ECHO_T}Building with '$CXXFLAGS' for C++ compiler flags." >&6
--echo "$as_me:$LINENO: result: Building with '$LIBS' for linker flags." >&5
--echo "${ECHO_T}Building with '$LIBS' for linker flags." >&6
--echo "$as_me:$LINENO: result: " >&5
--echo "${ECHO_T}" >&6
  
  
--ac_config_headers="$ac_config_headers config.h"
  
--ac_config_commands="$ac_config_commands default-1"
--
--ac_config_files="$ac_config_files Makefile src/Makefile util/Makefile data/Makefile data/styles/Makefile doc/Makefile nls/Makefile nls/C/Makefile nls/da_DK/Makefile nls/de_DE/Makefile nls/es_ES/Makefile nls/et_EE/Makefile nls/fr_FR/Makefile nls/it_IT/Makefile nls/ja_JP/Makefile nls/nl_NL/Makefile nls/pt_BR/Makefile nls/ru_RU/Makefile nls/sl_SI/Makefile nls/sv_SE/Makefile nls/tr_TR/Makefile nls/zh_CN/Makefile version.h"
--cat >confcache <<\_ACEOF
++trap '' 1 2 15
++cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
  #
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
  #
--# `ac_cv_env_foo' variables (set or unset) will be overriden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
--
--_ACEOF
--
++EOF
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
  # So, don't put newlines in cache variables' values.
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--        "s/'/'\\\\''/g;
--    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if cmp -s $cache_file confcache; then :; else
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
    if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
    else
      echo "not updating unwritable cache $cache_file"
    fi
  fi
  rm -f confcache
  
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
  test "x$prefix" = xNONE && prefix=$ac_default_prefix
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
++# Any assignment to VPATH causes Sun make to only execute
++# the first set of double-colon rules, so remove it if not needed.
++# If there is a colon in the path, we need to keep it.
  if test "x$srcdir" = x.; then
--  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ 	]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[ 	]*$//;
--}'
++  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
  fi
  
--DEFS=-DHAVE_CONFIG_H
++trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
  
++DEFS=-DHAVE_CONFIG_H
  
++# Without the "./", some shells look in PATH for config.status.
  : ${CONFIG_STATUS=./config.status}
--ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
--#! $SHELL
--# Generated by $as_me.
--# Run this file to recreate the current configuration.
--# Compiler output produced by configure, useful for debugging
--# configure, is in config.log if it exists.
--
--debug=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_ACEOF
--
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
--
--# Be Bourne compatible
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
--fi
--
--# NLS nuisances.
--# Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
--(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
--    { $as_unset LANG || test "${LANG+set}" != set; } ||
--      { LANG=C; export LANG; }
--(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
--    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
--      { LC_ALL=C; export LC_ALL; }
--(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
--    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
--      { LC_TIME=C; export LC_TIME; }
--(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
--    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
--      { LC_CTYPE=C; export LC_CTYPE; }
--(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
--    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
--      { LANGUAGE=C; export LANGUAGE; }
--(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
--    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
--      { LC_COLLATE=C; export LC_COLLATE; }
--(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
--    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
--      { LC_NUMERIC=C; export LC_NUMERIC; }
--(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
--    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
--      { LC_MESSAGES=C; export LC_MESSAGES; }
--
--
--# Name of the executable.
--as_me=`(basename "$0") 2>/dev/null ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conftest.sh
--  echo  "exit 0"   >>conftest.sh
--  chmod +x conftest.sh
--  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conftest.sh
--fi
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
--    sed '
--      N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
--      t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
--    ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
--   { (exit 1); exit 1; }; }
--
--  # Don't try to exec as it changes $[0], causing all sort of problems
--  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
--  # Exit status is that of the last command.
--  exit
--}
--
--
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
--esac
--
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--rm -f conf$$ conf$$.exe conf$$.file
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
--    as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
--else
--  as_ln_s='cp -p'
--fi
--rm -f conf$$ conf$$.exe conf$$.file
--
--as_executable_p="test -f"
--
--# Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
--
--# Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
--
--
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
--
--exec 6>&1
--
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
--# report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.  Logging --version etc. is OK.
--exec 5>>config.log
--{
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
--This file was extended by $as_me, which was
--generated by GNU Autoconf 2.53.  Invocation command line was
--
--  CONFIG_FILES    = $CONFIG_FILES
--  CONFIG_HEADERS  = $CONFIG_HEADERS
--  CONFIG_LINKS    = $CONFIG_LINKS
--  CONFIG_COMMANDS = $CONFIG_COMMANDS
--  $ $0 $@
--
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
--_ACEOF
--
--# Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
--
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--ac_cs_usage="\
--\`$as_me' instantiates files from templates according to the
--current configuration.
--
--Usage: $0 [OPTIONS] [FILE]...
--
--  -h, --help       print this help, then exit
--  -V, --version    print version number, then exit
--  -d, --debug      don't remove temporary files
--      --recheck    update $as_me by reconfiguring in the same conditions
--  --file=FILE[:TEMPLATE]
--                   instantiate the configuration file FILE
--  --header=FILE[:TEMPLATE]
--                   instantiate the configuration header FILE
--
--Configuration files:
--$config_files
--
--Configuration headers:
--$config_headers
--
--Configuration commands:
--$config_commands
--
--Report bugs to <bug-autoconf@gnu.org>."
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--ac_cs_version="\\
--config.status
--configured by $0, generated by GNU Autoconf 2.53,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
--This config.status script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
--_ACEOF
--
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If no file are specified by the user, then we need to provide default
--# value.  By we need to know if files were specified by the user.
--ac_need_defaults=:
--while test $# != 0
--do
--  case $1 in
--  --*=*)
--    ac_option=`expr "x$1" : 'x\([^=]*\)='`
--    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
--    shift
--    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
--    shift
--    ;;
--  -*);;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_need_defaults=false;;
--  esac
--
--  case $1 in
--  # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
--  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
--    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
--    debug=: ;;
--  --file | --fil | --fi | --f )
--    shift
--    CONFIG_FILES="$CONFIG_FILES $1"
--    ac_need_defaults=false;;
--  --header | --heade | --head | --hea )
--    shift
--    CONFIG_HEADERS="$CONFIG_HEADERS $1"
--    ac_need_defaults=false;;
--
--  # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; } ;;
--
--  *) ac_config_targets="$ac_config_targets $1" ;;
--
--  esac
--  shift
--done
--
--_ACEOF
  
--cat >>$CONFIG_STATUS <<_ACEOF
++echo creating $CONFIG_STATUS
++rm -f $CONFIG_STATUS
++cat > $CONFIG_STATUS <<EOF
++#! /bin/sh
++# Generated automatically by configure.
++# Run this file to recreate the current configuration.
++# This directory was configured as follows,
++# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  #
--# INIT-COMMANDS section.
++# $0 $ac_configure_args
  #
++# Compiler output produced by configure, useful for debugging
++# configure, is in ./config.log if it exists.
  
--
--
--_ACEOF
--
--
--
--cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_config_target in $ac_config_targets
++ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
++for ac_option
  do
--  case "$ac_config_target" in
--  # Handling of arguments.
--  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
--  "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
--  "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
--  "data/styles/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/styles/Makefile" ;;
--  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
--  "nls/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/Makefile" ;;
--  "nls/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/C/Makefile" ;;
--  "nls/da_DK/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/da_DK/Makefile" ;;
--  "nls/de_DE/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/de_DE/Makefile" ;;
--  "nls/es_ES/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/es_ES/Makefile" ;;
--  "nls/et_EE/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/et_EE/Makefile" ;;
--  "nls/fr_FR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/fr_FR/Makefile" ;;
--  "nls/it_IT/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/it_IT/Makefile" ;;
--  "nls/ja_JP/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/ja_JP/Makefile" ;;
--  "nls/nl_NL/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/nl_NL/Makefile" ;;
--  "nls/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/pt_BR/Makefile" ;;
--  "nls/ru_RU/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/ru_RU/Makefile" ;;
--  "nls/sl_SI/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/sl_SI/Makefile" ;;
--  "nls/sv_SE/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/sv_SE/Makefile" ;;
--  "nls/tr_TR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/tr_TR/Makefile" ;;
--  "nls/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/zh_CN/Makefile" ;;
--  "version.h" ) CONFIG_FILES="$CONFIG_FILES version.h" ;;
--  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
--  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--   { (exit 1); exit 1; }; };;
++  case "\$ac_option" in
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    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"
++    exit 0 ;;
++  -help | --help | --hel | --he | --h)
++    echo "\$ac_cs_usage"; exit 0 ;;
++  *) echo "\$ac_cs_usage"; exit 1 ;;
    esac
  done
  
--# If the user did not use the arguments to specify the items to instantiate,
--# then the envvar interface is used.  Set only those that are not.
--# We use the long form for the default assignment because of an extremely
--# bizarre bug on SunOS 4.1.3.
--if $ac_need_defaults; then
--  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
--  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
--  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
--fi
--
--# Create a temporary directory, and hook for its removal unless debugging.
--$debug ||
--{
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
--  trap '{ (exit 1); exit 1; }' 1 2 13 15
--}
--
--# Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
--{
--  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
--  test -n "$tmp" && test -d "$tmp"
--}  ||
--{
--  tmp=$TMPDIR/cs$$-$RANDOM
--  (umask 077 && mkdir $tmp)
--} ||
--{
--   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
--   { (exit 1); exit 1; }
--}
--
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
--#
--# CONFIG_FILES section.
--#
++ac_given_srcdir=$srcdir
++ac_given_INSTALL="$INSTALL"
++
++trap 'rm -fr `echo "Makefile
++src/Makefile
++util/Makefile
++data/Makefile
++data/styles/Makefile
++doc/Makefile
++nls/Makefile
++nls/C/Makefile
++nls/da_DK/Makefile
++nls/de_DE/Makefile
++nls/es_ES/Makefile
++nls/et_EE/Makefile
++nls/fr_FR/Makefile
++nls/it_IT/Makefile
++nls/ja_JP/Makefile
++nls/nl_NL/Makefile
++nls/pt_BR/Makefile
++nls/ru_RU/Makefile
++nls/sl_SI/Makefile
++nls/sv_SE/Makefile
++nls/tr_TR/Makefile
++nls/zh_CN/Makefile
++version.h config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++EOF
++cat >> $CONFIG_STATUS <<EOF
++
++# Protect against being on the right side of a sed subst in config.status.
++sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
++ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
++$ac_vpsub
++$extrasub
++s%@SHELL@%$SHELL%g
++s%@CFLAGS@%$CFLAGS%g
++s%@CPPFLAGS@%$CPPFLAGS%g
++s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
++s%@DEFS@%$DEFS%g
++s%@LDFLAGS@%$LDFLAGS%g
++s%@LIBS@%$LIBS%g
++s%@exec_prefix@%$exec_prefix%g
++s%@prefix@%$prefix%g
++s%@program_transform_name@%$program_transform_name%g
++s%@bindir@%$bindir%g
++s%@sbindir@%$sbindir%g
++s%@libexecdir@%$libexecdir%g
++s%@datadir@%$datadir%g
++s%@sysconfdir@%$sysconfdir%g
++s%@sharedstatedir@%$sharedstatedir%g
++s%@localstatedir@%$localstatedir%g
++s%@libdir@%$libdir%g
++s%@includedir@%$includedir%g
++s%@oldincludedir@%$oldincludedir%g
++s%@infodir@%$infodir%g
++s%@mandir@%$mandir%g
++s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
++s%@INSTALL_DATA@%$INSTALL_DATA%g
++s%@PACKAGE@%$PACKAGE%g
++s%@VERSION@%$VERSION%g
++s%@ACLOCAL@%$ACLOCAL%g
++s%@AUTOCONF@%$AUTOCONF%g
++s%@AUTOMAKE@%$AUTOMAKE%g
++s%@AUTOHEADER@%$AUTOHEADER%g
++s%@MAKEINFO@%$MAKEINFO%g
++s%@SET_MAKE@%$SET_MAKE%g
++s%@CC@%$CC%g
++s%@CXX@%$CXX%g
++s%@regex_cmd@%$regex_cmd%g
++s%@CXXCPP@%$CXXCPP%g
++s%@X_CFLAGS@%$X_CFLAGS%g
++s%@X_PRE_LIBS@%$X_PRE_LIBS%g
++s%@X_LIBS@%$X_LIBS%g
++s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
++s%@SHAPE@%$SHAPE%g
++s%@SLIT@%$SLIT%g
++s%@NEWWMSPEC@%$NEWWMSPEC%g
++s%@INTERLACE@%$INTERLACE%g
++s%@ORDEREDPSEUDO@%$ORDEREDPSEUDO%g
++s%@CLOBBER@%$CLOBBER%g
++s%@DEBUG@%$DEBUG%g
++s%@NLS@%$NLS%g
++s%@gencat_cmd@%$gencat_cmd%g
++s%@TIMEDCACHE@%$TIMEDCACHE%g
++s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
++s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
++s%@MAINT@%$MAINT%g
  
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s,@SHELL@,$SHELL,;t t
--s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s,@exec_prefix@,$exec_prefix,;t t
--s,@prefix@,$prefix,;t t
--s,@program_transform_name@,$program_transform_name,;t t
--s,@bindir@,$bindir,;t t
--s,@sbindir@,$sbindir,;t t
--s,@libexecdir@,$libexecdir,;t t
--s,@datadir@,$datadir,;t t
--s,@sysconfdir@,$sysconfdir,;t t
--s,@sharedstatedir@,$sharedstatedir,;t t
--s,@localstatedir@,$localstatedir,;t t
--s,@libdir@,$libdir,;t t
--s,@includedir@,$includedir,;t t
--s,@oldincludedir@,$oldincludedir,;t t
--s,@infodir@,$infodir,;t t
--s,@mandir@,$mandir,;t t
--s,@build_alias@,$build_alias,;t t
--s,@host_alias@,$host_alias,;t t
--s,@target_alias@,$target_alias,;t t
--s,@DEFS@,$DEFS,;t t
--s,@ECHO_C@,$ECHO_C,;t t
--s,@ECHO_N@,$ECHO_N,;t t
--s,@ECHO_T@,$ECHO_T,;t t
--s,@LIBS@,$LIBS,;t t
--s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s,@INSTALL_DATA@,$INSTALL_DATA,;t t
--s,@PACKAGE@,$PACKAGE,;t t
--s,@VERSION@,$VERSION,;t t
--s,@ACLOCAL@,$ACLOCAL,;t t
--s,@AUTOCONF@,$AUTOCONF,;t t
--s,@AUTOMAKE@,$AUTOMAKE,;t t
--s,@AUTOHEADER@,$AUTOHEADER,;t t
--s,@MAKEINFO@,$MAKEINFO,;t t
--s,@SET_MAKE@,$SET_MAKE,;t t
--s,@CC@,$CC,;t t
--s,@CFLAGS@,$CFLAGS,;t t
--s,@LDFLAGS@,$LDFLAGS,;t t
--s,@CPPFLAGS@,$CPPFLAGS,;t t
--s,@ac_ct_CC@,$ac_ct_CC,;t t
--s,@EXEEXT@,$EXEEXT,;t t
--s,@OBJEXT@,$OBJEXT,;t t
--s,@CXX@,$CXX,;t t
--s,@CXXFLAGS@,$CXXFLAGS,;t t
--s,@ac_ct_CXX@,$ac_ct_CXX,;t t
--s,@regex_cmd@,$regex_cmd,;t t
--s,@CPP@,$CPP,;t t
--s,@X_CFLAGS@,$X_CFLAGS,;t t
--s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
--s,@X_LIBS@,$X_LIBS,;t t
--s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s,@SHAPE@,$SHAPE,;t t
--s,@SLIT@,$SLIT,;t t
--s,@NEWWMSPEC@,$NEWWMSPEC,;t t
--s,@INTERLACE@,$INTERLACE,;t t
--s,@ORDEREDPSEUDO@,$ORDEREDPSEUDO,;t t
--s,@CLOBBER@,$CLOBBER,;t t
--s,@DEBUG@,$DEBUG,;t t
--s,@NLS@,$NLS,;t t
--s,@gencat_cmd@,$gencat_cmd,;t t
--s,@TIMEDCACHE@,$TIMEDCACHE,;t t
--s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--s,@MAINT@,$MAINT,;t t
  CEOF
--
--_ACEOF
--
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    else
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
++EOF
++
++cat >> $CONFIG_STATUS <<\EOF
++
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++  if test $ac_beg -gt 1; then
++    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
++  else
++    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
++  fi
++  if test ! -s conftest.s$ac_file; then
++    ac_more_lines=false
++    rm -f conftest.s$ac_file
++  else
++    if test -z "$ac_sed_cmds"; then
++      ac_sed_cmds="sed -f conftest.s$ac_file"
      else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--      else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
++      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
      fi
--  done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
++    ac_file=`expr $ac_file + 1`
++    ac_beg=$ac_end
++    ac_end=`expr $ac_end + $ac_max_sed_cmds`
    fi
--fi # test -n "$CONFIG_FILES"
--
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++done
++if test -z "$ac_sed_cmds"; then
++  ac_sed_cmds=cat
++fi
++EOF
++
++cat >> $CONFIG_STATUS <<EOF
++
++CONFIG_FILES=\${CONFIG_FILES-"Makefile
++src/Makefile
++util/Makefile
++data/Makefile
++data/styles/Makefile
++doc/Makefile
++nls/Makefile
++nls/C/Makefile
++nls/da_DK/Makefile
++nls/de_DE/Makefile
++nls/es_ES/Makefile
++nls/et_EE/Makefile
++nls/fr_FR/Makefile
++nls/it_IT/Makefile
++nls/ja_JP/Makefile
++nls/nl_NL/Makefile
++nls/pt_BR/Makefile
++nls/ru_RU/Makefile
++nls/sl_SI/Makefile
++nls/sv_SE/Makefile
++nls/tr_TR/Makefile
++nls/zh_CN/Makefile
++version.h"}
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
--  esac
--
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_file" : 'X\(//\)[^/]' \| \
--         X"$ac_file" : 'X\(//\)$' \| \
--         X"$ac_file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { case "$ac_dir" in
--  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
--  *)                      as_incr_dir=.;;
--esac
--as_dummy="$ac_dir"
--for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
--  case $as_mkdir_dir in
--    # Skip DOS drivespec
--    ?:) as_incr_dir=$as_mkdir_dir ;;
--    *)
--      as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" ||
--        mkdir "$as_incr_dir" ||
--	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }
--    ;;
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
    esac
--done; }
  
--  ac_builddir=.
++  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
  
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
++  # Remove last slash and all that follows it.  Not all systems have dirname.
++  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++    # The file is in a subdirectory.
++    test ! -d "$ac_dir" && mkdir "$ac_dir"
++    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
++    # A "../" for each directory in $ac_dir_suffix.
++    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
++  else
++    ac_dir_suffix= ac_dots=
++  fi
  
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
++  case "$ac_given_srcdir" in
++  .)  srcdir=.
++      if test -z "$ac_dots"; then top_srcdir=.
++      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
++  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
    *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--
--
--  case $INSTALL in
--  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
++    top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--                                     sed 's,.*/,,'` by configure."
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         echo $f;;
--      *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--_ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
--  sed "$ac_vpsub
--$extrasub
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--:t
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s,@configure_input@,$configure_input,;t t
--s,@srcdir@,$ac_srcdir,;t t
--s,@abs_srcdir@,$ac_abs_srcdir,;t t
--s,@top_srcdir@,$ac_top_srcdir,;t t
--s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s,@builddir@,$ac_builddir,;t t
--s,@abs_builddir@,$ac_abs_builddir,;t t
--s,@top_builddir@,$ac_top_builddir,;t t
--s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
--s,@INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
++  case "$ac_given_INSTALL" in
++  [/$]*) INSTALL="$ac_given_INSTALL" ;;
++  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++  esac
  
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
++  echo creating "$ac_file"
++  rm -f "$ac_file"
++  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
++  case "$ac_file" in
++  *Makefile*) ac_comsub="1i\\
++# $configure_input" ;;
++  *) ac_comsub= ;;
++  esac
  
--#
--# CONFIG_HEADER section.
--#
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  sed -e "$ac_comsub
++s%@configure_input@%$configure_input%g
++s%@srcdir@%$srcdir%g
++s%@top_srcdir@%$top_srcdir%g
++s%@INSTALL@%$INSTALL%g
++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
++fi; done
++rm -f conftest.s*
  
  # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
  # NAME is the cpp macro being defined and VALUE is the value it is being given.
  #
  # ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
--ac_dB='[ 	].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
--ac_uB='$,\1#\2define\3'
++ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
++ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
++ac_dC='\3'
++ac_dD='%g'
++# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
++ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_uB='\([ 	]\)%\1#\2define\3'
  ac_uC=' '
--ac_uD=',;t'
--
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
++ac_uD='\4%g'
++# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_eB='$%\1#\2define\3'
++ac_eC=' '
++ac_eD='%g'
++
++if test "${CONFIG_HEADERS+set}" != set; then
++EOF
++cat >> $CONFIG_STATUS <<EOF
++  CONFIG_HEADERS="config.h"
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++fi
++for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--        cat >$tmp/stdin
--        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
    esac
  
--  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         echo $f;;
--      *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--  # Remove the trailing spaces.
--  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
--
--_ACEOF
--
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h.  The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status.  Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless.  Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
++  echo creating $ac_file
++
++  rm -f conftest.frag conftest.in conftest.out
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  cat $ac_file_inputs > conftest.in
++
++EOF
++
++# Transform confdefs.h into a sed script conftest.vals that substitutes
++# the proper values into config.h.in to produce config.h.  And first:
++# Protect against being on the right side of a sed subst in config.status.
++# Protect against being in an unquoted here document in config.status.
++rm -f conftest.vals
++cat > conftest.hdr <<\EOF
++s/[\\&%]/\\&/g
++s%[\\$`]%\\&%g
++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
++s%ac_d%ac_u%gp
++s%ac_u%ac_e%gp
++EOF
++sed -n -f conftest.hdr confdefs.h > conftest.vals
++rm -f conftest.hdr
  
  # This sed command replaces #undef with comments.  This is necessary, for
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
--
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
--do
--  # Write a limited-size here document to $tmp/defines.sed.
--  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#define' lines.
--  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/defines.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
--  rm -f conftest.defines
--  mv conftest.tail conftest.defines
--done
--rm -f conftest.defines
--echo '  fi # egrep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
++cat >> conftest.vals <<\EOF
++s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
++EOF
++
++# Break up conftest.vals because some shells have a limit on
++# the size of here documents, and old seds have small limits too.
  
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
  rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
++while :
  do
--  # Write a limited-size here document to $tmp/undefs.sed.
--  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#undef'
--  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
++  ac_lines=`grep -c . conftest.vals`
++  # grep -c gives empty output for an empty file on some AIX systems.
++  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
++  # Write a limited-size here document to conftest.frag.
++  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
    echo 'CEOF
--  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--  rm -f conftest.undefs
--  mv conftest.tail conftest.undefs
++  sed -f conftest.frag conftest.in > conftest.out
++  rm -f conftest.in
++  mv conftest.out conftest.in
++' >> $CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
++  rm -f conftest.vals
++  mv conftest.tail conftest.vals
  done
--rm -f conftest.undefs
--
--cat >>$CONFIG_STATUS <<\_ACEOF
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    echo "/* Generated by configure.  */" >$tmp/config.h
++rm -f conftest.vals
++
++cat >> $CONFIG_STATUS <<\EOF
++  rm -f conftest.frag conftest.h
++  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
++  cat conftest.in >> conftest.h
++  rm -f conftest.in
++  if cmp -s $ac_file conftest.h 2>/dev/null; then
++    echo "$ac_file is unchanged"
++    rm -f conftest.h
    else
--    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
--  fi
--  cat $tmp/in >>$tmp/config.h
--  rm -f $tmp/in
--  if test x"$ac_file" != x-; then
--    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
--echo "$as_me: $ac_file is unchanged" >&6;}
--    else
--      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_file" : 'X\(//\)[^/]' \| \
--         X"$ac_file" : 'X\(//\)$' \| \
--         X"$ac_file" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--      { case "$ac_dir" in
--  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
--  *)                      as_incr_dir=.;;
--esac
--as_dummy="$ac_dir"
--for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
--  case $as_mkdir_dir in
--    # Skip DOS drivespec
--    ?:) as_incr_dir=$as_mkdir_dir ;;
--    *)
--      as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" ||
--        mkdir "$as_incr_dir" ||
--	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }
--    ;;
--  esac
--done; }
--
--      rm -f $ac_file
--      mv $tmp/config.h $ac_file
++    # Remove last slash and all that follows it.  Not all systems have dirname.
++      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++      # The file is in a subdirectory.
++      test ! -d "$ac_dir" && mkdir "$ac_dir"
      fi
--  else
--    cat $tmp/config.h
--    rm -f $tmp/config.h
++    rm -f $ac_file
++    mv conftest.h $ac_file
    fi
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
++fi; done
  
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
--  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
--  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
--  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--         X"$ac_dest" : 'X\(//\)[^/]' \| \
--         X"$ac_dest" : 'X\(//\)$' \| \
--         X"$ac_dest" : 'X\(/\)' \| \
--         .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  ac_builddir=.
--
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
--
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--
--
--  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
--  case $ac_dest in
--    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
--  esac
--done
--_ACEOF
++EOF
++cat >> $CONFIG_STATUS <<EOF
  
--cat >>$CONFIG_STATUS <<\_ACEOF
  
--{ (exit 0); exit 0; }
--_ACEOF
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
++
++exit 0
++EOF
  chmod +x $CONFIG_STATUS
--ac_clean_files=$ac_clean_files_save
--
--
--# configure is writing to config.log, and then calls config.status.
--# config.status does its own redirection, appending to config.log.
--# Unfortunately, on DOS this fails, as config.log is still kept open
--# by configure, so config.status won't be able to write to it; its
--# output is simply discarded.  So we exec the FD to /dev/null,
--# effectively closing config.log, so it can be properly (re)opened and
--# appended to by config.status.  When coming back to configure, we
--# need to make the FD available again.
--if test "$no_create" != yes; then
--  ac_cs_success=:
--  exec 5>/dev/null
--  $SHELL $CONFIG_STATUS || ac_cs_success=false
--  exec 5>>config.log
--  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
--  # would make configure fail if this is the last instruction.
--  $ac_cs_success || { (exit 1); exit 1; }
--fi
++rm -fr confdefs* $ac_clean_files
++test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
  
diff --cc configure.in
index 65699008,f37715db..3ec9cc3a
--- a/configure.in
+++ b/configure.in
@@@ -1,7 -1,7 +1,7 @@@
  dnl configure.in for Openbox
  dnl Initialize autoconf and automake
  AC_INIT(src/openbox.cc)
- AM_INIT_AUTOMAKE(openbox,0.99.0,no-define)
 -AM_INIT_AUTOMAKE(openbox,1.1.0,no-define)
++AM_INIT_AUTOMAKE(openbox,1.0.1,no-define)
  
  dnl Determine default prefix
  test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@@ -15,14 -15,13 +15,15 @@@ AC_PROG_C
  AC_PROG_CXX
  AC_PROG_INSTALL
  
++AC_LANG_CPLUSPLUS
++
  AC_CHECK_PROGS(regex_cmd, sed)
  if test x$regex_cmd = "x"; then
    AC_MSG_ERROR([error. sed is required to build the default menu file.])
  fi
  
  dnl Check for system header files
- AC_HEADER_STDC
- AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
 -AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
++AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h sstream)
  AC_HEADER_TIME
  
  dnl Check for existance of basename(), setlocale() and strftime()
diff --cc data/Makefile.in
index a7e35d44,a21707f9..999b01f6
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
@@@ -136,7 -136,7 +136,7 @@@ maintainer-clean-recursive
  	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
++	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
diff --cc data/styles/Makefile.in
index 6df1f4b0,9aa59d62..c6ac1e4e
--- a/data/styles/Makefile.in
+++ b/data/styles/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc doc/Makefile.in
index 191f9ce5,4743034e..2edd9e35
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
@@@ -182,7 -182,7 +182,7 @@@ maintainer-clean-recursive
  	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
++	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
diff --cc nls/C/Configmenu.m
index d01e3c15,f6b422a2..741e468d
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@@ -28,6 -28,12 +28,8 @@@ $ #SmartCol
  # Smart Placement (Columns)
  $ #Cascade
  # Cascade Placement
+ $ #BestFit
+ # Best Fit Placement
 -$ #UnderMouse
 -# Under Mouse Placement
 -$ #ClickMouse
 -# Click Mouse Placement
  $ #LeftRight
  # Left to Right
  $ #RightLeft
diff --cc nls/C/Makefile.in
index 51a61954,51a61954..261493ad
--- a/nls/C/Makefile.in
+++ b/nls/C/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/Makefile.in
index d8e81ccf,d8e81ccf..59bc72fe
--- a/nls/Makefile.in
+++ b/nls/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
@@@ -138,7 -138,7 +138,7 @@@ maintainer-clean-recursive
  	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
++	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
diff --cc nls/da_DK/Makefile.in
index a4a68cc5,a4a68cc5..fb403dcf
--- a/nls/da_DK/Makefile.in
+++ b/nls/da_DK/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/de_DE/Makefile.in
index 0cc0e92f,0cc0e92f..3cb22b5e
--- a/nls/de_DE/Makefile.in
+++ b/nls/de_DE/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/es_ES/Makefile.in
index 5c57f6cd,5c57f6cd..f62a4bd5
--- a/nls/es_ES/Makefile.in
+++ b/nls/es_ES/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/et_EE/Makefile.in
index 34f1f4e9,34f1f4e9..90d65c15
--- a/nls/et_EE/Makefile.in
+++ b/nls/et_EE/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/fr_FR/Makefile.in
index 97c725c0,97c725c0..9e9ac645
--- a/nls/fr_FR/Makefile.in
+++ b/nls/fr_FR/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/it_IT/Makefile.in
index 75fca323,75fca323..7caece23
--- a/nls/it_IT/Makefile.in
+++ b/nls/it_IT/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/ja_JP/Makefile.in
index 157e34fe,157e34fe..ce94b31b
--- a/nls/ja_JP/Makefile.in
+++ b/nls/ja_JP/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/nl_NL/Makefile.in
index daee5edd,daee5edd..e83e4c2c
--- a/nls/nl_NL/Makefile.in
+++ b/nls/nl_NL/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/pt_BR/Makefile.in
index 4fc147bc,4fc147bc..aac4d8e1
--- a/nls/pt_BR/Makefile.in
+++ b/nls/pt_BR/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/ru_RU/Makefile.in
index e5ca4ac4,e5ca4ac4..5c295e16
--- a/nls/ru_RU/Makefile.in
+++ b/nls/ru_RU/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/sl_SI/Makefile.in
index a4ca149b,a4ca149b..aaf704da
--- a/nls/sl_SI/Makefile.in
+++ b/nls/sl_SI/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/sv_SE/Makefile.in
index 94fbf4cf,94fbf4cf..381429cf
--- a/nls/sv_SE/Makefile.in
+++ b/nls/sv_SE/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/tr_TR/Makefile.in
index 0f91733a,0f91733a..b9911fc1
--- a/nls/tr_TR/Makefile.in
+++ b/nls/tr_TR/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc nls/zh_CN/Makefile.in
index 96ed28d3,96ed28d3..eeb26c03
--- a/nls/zh_CN/Makefile.in
+++ b/nls/zh_CN/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc src/Basemenu.cc
index b0e97606,8a3429a0..c5ecd3bb
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@@ -140,14 -141,12 +141,14 @@@ Basemenu::Basemenu(BScreen &scrn) : ope
  
    attrib.event_mask |= PointerMotionMask;
    menu.frame = XCreateWindow(display, menu.window, 0,
- 			     menu.title_h + screen->getBorderWidth(),
+ 			     menu.title_h + screen.getBorderWidth(),
  			     menu.width, menu.frame_h, 0,
- 			     screen->getDepth(), InputOutput,
- 			     screen->getVisual(), attrib_mask, &attrib);
-   openbox->saveMenuSearch(menu.frame, this);
+ 			     screen.getDepth(), InputOutput,
+ 			     screen.getVisual(), attrib_mask, &attrib);
+   openbox.saveMenuSearch(menu.frame, this);
  
 +  menuitems = new LinkedList<BasemenuItem>;
 +
    // even though this is the end of the constructor the menu is still not
    // completely created.  items must be inserted and it must be update()'d
  }
@@@ -313,12 -319,12 +314,12 @@@ void Basemenu::update(void) 
      menu.item_w = ((menu.item_w < (unsigned int) ii) ? ii : menu.item_w);
    }
  
 -  if (menuitems.size()) {
 +  if (menuitems->count()) {
      menu.sublevels = 1;
  
 -    while (((menu.item_h * (menuitems.size() + 1) / menu.sublevels)
 +    while (((menu.item_h * (menuitems->count() + 1) / menu.sublevels)
- 	    + menu.title_h + screen->getBorderWidth()) >
- 	   screen->getHeight())
+ 	    + menu.title_h + screen.getBorderWidth()) >
+ 	   screen.size().h())
        menu.sublevels++;
  
      if (menu.sublevels < menu.minsub) menu.sublevels = menu.minsub;
diff --cc src/Basemenu.h
index ba28404c,83ea3567..fc9c894c
--- a/src/Basemenu.h
+++ b/src/Basemenu.h
@@@ -35,11 -35,11 +35,11 @@@ class BasemenuItem
  
  class Basemenu {
  private:
 -  menuitemList menuitems;
 +  LinkedList<BasemenuItem> *menuitems;
-   Openbox *openbox;
+   Openbox &openbox;
    Basemenu *parent;
    BImageControl *image_ctrl;
-   BScreen *screen;
+   BScreen &screen;
  
    Bool moving, visible, movable, torn, internal_menu, title_vis, shifted,
      hide_tree;
diff --cc src/Configmenu.cc
index 97faf779,ffb5d6e3..413e0b25
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@@ -85,10 -91,9 +91,10 @@@ void Configmenu::itemSelected(int butto
  
    switch(item->function()) {
    case 1: { // dither
-     screen->getImageControl()->
-       setDither((! screen->getImageControl()->doDither()));
 -    screen.setImageDither(!screen.getImageControl()->doDither());
++    screen.getImageControl()->
++      setDither((! screen.getImageControl()->doDither()));
  
-     setItemSelected(index, screen->getImageControl()->doDither());
+     setItemSelected(index, screen.getImageControl()->doDither());
  
      break;
    }
@@@ -215,6 -235,14 +236,8 @@@ Configmenu::Placementmenu::Placementmen
  	 BScreen::ColSmartPlacement);
    insert(i18n->getMessage(ConfigmenuSet, ConfigmenuCascade,
  			  "Cascade Placement"), BScreen::CascadePlacement);
+   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuBestFit,
+                           "Best Fit Placement"), BScreen::BestFitPlacement);
 -  insert(i18n->getMessage(ConfigmenuSet, ConfigmenuUnderMouse,
 -                          "Under Mouse Placement"),
 -         BScreen::UnderMousePlacement);
 -  insert(i18n->getMessage(ConfigmenuSet, ConfigmenuClickMouse,
 -                          "Click Mouse Placement"),
 -         BScreen::ClickMousePlacement);
    insert(i18n->getMessage(ConfigmenuSet, ConfigmenuLeftRight,
  			  "Left to Right"), BScreen::LeftRight);
    insert(i18n->getMessage(ConfigmenuSet, ConfigmenuRightLeft,
@@@ -225,30 -253,41 +248,43 @@@
  			  "Bottom to Top"), BScreen::BottomTop);
    update();
  
-   switch (configmenu->screen->getPlacementPolicy()) {
+   setValues();
+ }
+ 
+ void Configmenu::Placementmenu::setValues() {
 -  const int p = configmenu->screen.placementPolicy();
 -  setItemSelected(0, p == BScreen::RowSmartPlacement);
 -  setItemSelected(1, p == BScreen::ColSmartPlacement);
 -  setItemSelected(2, p == BScreen::CascadePlacement);
 -  setItemSelected(3, p == BScreen::BestFitPlacement);
 -  setItemSelected(4, p == BScreen::UnderMousePlacement);
 -  setItemSelected(5, p == BScreen::ClickMousePlacement);
 -
 -  bool rl = (configmenu->screen.rowPlacementDirection() ==
++  switch (configmenu->screen.placementPolicy()) {
 +  case BScreen::RowSmartPlacement:
 +    setItemSelected(0, True);
 +    break;
 +
 +  case BScreen::ColSmartPlacement:
 +    setItemSelected(1, True);
 +    break;
 +
 +  case BScreen::CascadePlacement:
 +    setItemSelected(2, True);
 +    break;
++
++  case BScreen::BestFitPlacement:
++    setItemSelected(3, True);
++    break;
 +  }
 +
-   Bool rl = (configmenu->screen->getRowPlacementDirection() ==
++  Bool rl = (configmenu->screen.rowPlacementDirection() ==
  	     BScreen::LeftRight),
-        tb = (configmenu->screen->getColPlacementDirection() ==
+        tb = (configmenu->screen.colPlacementDirection() ==
  	     BScreen::TopBottom);
  
-   setItemSelected(3, rl);
-   setItemSelected(4, ! rl);
 -  setItemSelected(6, rl);
 -  setItemEnabled(6, (p != BScreen::UnderMousePlacement &&
 -                     p != BScreen::ClickMousePlacement));
 -  setItemSelected(7, !rl);
 -  setItemEnabled(7, (p != BScreen::UnderMousePlacement &&
 -                     p != BScreen::ClickMousePlacement));
 -
 -  setItemSelected(8, tb);
 -  setItemEnabled(8, (p != BScreen::UnderMousePlacement &&
 -                     p != BScreen::ClickMousePlacement));
 -  setItemSelected(9, !tb);
 -  setItemEnabled(9, (p != BScreen::UnderMousePlacement &&
 -                     p != BScreen::ClickMousePlacement));
++  setItemSelected(4, rl);
++  setItemSelected(5, !rl);
 +
-   setItemSelected(5, tb);
-   setItemSelected(6, ! tb);
++  setItemSelected(6, tb);
++  setItemSelected(7, !tb);
+ }
+ 
+ void Configmenu::Placementmenu::reconfigure() {
+   setValues();
+   Basemenu::reconfigure();
  }
  
  void Configmenu::Placementmenu::itemSelected(int button, int index) {
@@@ -262,62 -301,44 +298,75 @@@
  
    switch (item->function()) {
    case BScreen::RowSmartPlacement:
-     configmenu->screen->savePlacementPolicy(item->function());
+     configmenu->screen.setPlacementPolicy(item->function());
 +
 +    setItemSelected(0, True);
 +    setItemSelected(1, False);
 +    setItemSelected(2, False);
++    setItemSelected(3, False);
 +
      break;
  
    case BScreen::ColSmartPlacement:
-     configmenu->screen->savePlacementPolicy(item->function());
+     configmenu->screen.setPlacementPolicy(item->function());
 +
 +    setItemSelected(0, False);
 +    setItemSelected(1, True);
 +    setItemSelected(2, False);
++    setItemSelected(3, False);
 +
      break;
  
    case BScreen::CascadePlacement:
-     configmenu->screen->savePlacementPolicy(item->function());
+     configmenu->screen.setPlacementPolicy(item->function());
 +
 +    setItemSelected(0, False);
 +    setItemSelected(1, False);
 +    setItemSelected(2, True);
++    setItemSelected(3, False);
 +
      break;
  
-   case BScreen::LeftRight:
-     configmenu->screen->saveRowPlacementDirection(BScreen::LeftRight);
+   case BScreen::BestFitPlacement:
+     configmenu->screen.setPlacementPolicy(item->function());
 -    break;
  
 -  case BScreen::UnderMousePlacement:
 -    configmenu->screen.setPlacementPolicy(item->function());
 -    break;
++    setItemSelected(0, False);
++    setItemSelected(1, False);
++    setItemSelected(2, False);
 +    setItemSelected(3, True);
-     setItemSelected(4, False);
  
 -  case BScreen::ClickMousePlacement:
 -    configmenu->screen.setPlacementPolicy(item->function());
      break;
  
-   case BScreen::RightLeft:
-     configmenu->screen->saveRowPlacementDirection(BScreen::RightLeft);
+   case BScreen::LeftRight:
+     configmenu->screen.setRowPlacementDirection(BScreen::LeftRight);
 +
-     setItemSelected(3, False);
 +    setItemSelected(4, True);
++    setItemSelected(5, False);
 +
      break;
  
-   case BScreen::TopBottom:
-     configmenu->screen->saveColPlacementDirection(BScreen::TopBottom);
+   case BScreen::RightLeft:
+     configmenu->screen.setRowPlacementDirection(BScreen::RightLeft);
 +
++    setItemSelected(4, False);
 +    setItemSelected(5, True);
-     setItemSelected(6, False);
 +
      break;
  
-   case BScreen::BottomTop:
-     configmenu->screen->saveColPlacementDirection(BScreen::BottomTop);
+   case BScreen::TopBottom:
+     configmenu->screen.setColPlacementDirection(BScreen::TopBottom);
 +
-     setItemSelected(5, False);
 +    setItemSelected(6, True);
++    setItemSelected(7, False);
++
+     break;
+ 
+   case BScreen::BottomTop:
+     configmenu->screen.setColPlacementDirection(BScreen::BottomTop);
++
++    setItemSelected(6, False);
++    setItemSelected(7, True);
 +
      break;
    }
 -  setValues();
  }
diff --cc src/Geometry.cc
index 00000000,cdc39474..db1de406
mode 000000,100644..100644
--- a/src/Geometry.cc
+++ b/src/Geometry.cc
@@@ -1,0 -1,145 +1,145 @@@
+ // Geometry.cc for Openbox
+ // Copyright (c) 2002 - 2002 ben Jansens (ben@orodu.net)
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining a
+ // copy of this software and associated documentation files (the "Software"),
+ // to deal in the Software without restriction, including without limitation
+ // the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ // and/or sell copies of the Software, and to permit persons to whom the
+ // Software is furnished to do so, subject to the following conditions:
+ //
+ // The above copyright notice and this permission notice shall be included in
+ // all copies or substantial portions of the Software.
+ //
+ // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ // DEALINGS IN THE SOFTWARE.
+ 
+ #include "Geometry.h"
+ 
+ Point::Point() : m_x(0), m_y(0) {
+ }
+ 
+ Point::Point(const Point &point) : m_x(point.m_x), m_y(point.m_y) {
+ }
+ 
+ Point::Point(const int x, const int y) : m_x(x), m_y(y) {
+ }
+ 
+ void Point::setX(const int x) {
+   m_x = x;
+ }
+ 
+ void Point::setY(const int y) {
+   m_y = y;
+ }
+ 
+ Size::Size() : m_w(0), m_h(0) {
+ }
+ 
+ Size::Size(const Size &size) : m_w(size.m_w), m_h(size.m_h) {
+ }
+ 
+ Size::Size(const unsigned int w, const unsigned int h) : m_w(w), m_h(h) {
+ }
+ 
+ void Size::setW(const unsigned int w) {
+   m_w = w;
+ }
+ 
+ void Size::setH(const unsigned int h) {
+   m_h = h;
+ }
+ 
+ Rect::Rect() : m_origin(0, 0), m_size(0, 0) {
+ }
+ 
+ Rect::Rect(const Point &origin, const Size &size) : m_origin(origin),
+   m_size(size) {
+ }
+ 
+ Rect::Rect(const int x, const int y, const unsigned int w, const unsigned int h)
+   : m_origin(x, y), m_size(w, h) {
+ }
+ 
+ void Rect::setSize(const Size &size) {
+   m_size = size;
+ }
+ 
+ void Rect::setSize(const unsigned int w, const unsigned int h) {
+   m_size.setW(w);
+   m_size.setH(h);
+ }
+ 
+ void Rect::setOrigin(const Point &origin) {
+   m_origin = origin;
+ }
+ 
+ void Rect::setOrigin(const int x, const int y) {
+   m_origin.setX(x);
+   m_origin.setY(y);
+ }
+ 
+ void Rect::setX(const int x) {
+   m_origin.setX(x);
+ }
+ 
+ void Rect::setY(const int y) {
+   m_origin.setY(y);
+ }
+ 
+ void Rect::setW(unsigned int w) {
+   m_size.setW(w);
+ }
+ 
+ void Rect::setH(unsigned int h) {
+   m_size.setH(h);
+ }
+ 
+ bool Rect::Intersect(const Rect &r) const {
+   return
 -    (x() < (r.x()+(signed)r.w()) ) &&
 -    ( (x()+(signed)w()) > r.x()) &&
 -    (y() < (r.y()+(signed)r.h()) ) &&
 -    ( (y()+(signed)h()) > r.y());
++    (x() < (r.x()+r.w()) ) &&
++    ( (x()+w()) > r.x()) &&
++    (y() < (r.y()+r.h()) ) &&
++    ( (y()+h()) > r.y());
+ }
+ 
+ Rect Rect::Inflate(const unsigned int i) const {
+   return Rect(x(), y(), w()+i, h()+i);
+ }
+ 
+ Rect Rect::Inflate(const unsigned int iw, const unsigned int ih) const {
+   return Rect(x(), y(), w()+iw, h()+ih);
+ }
+ 
+ Rect Rect::Inflate(const Size &i) const {
+   return Rect(x(), y(), w()+i.w(), h()+i.h());
+ }
+ 
+ Rect Rect::Deflate(const unsigned int d) const {
+   return Rect(x(), y(), w()-d, h()-d);
+ }
+ 
+ Rect Rect::Deflate(const unsigned int dw, const unsigned int dh) const {
+   return Rect(x(), y(), w()-dw, h()-dh);
+ }
+ 
+ Rect Rect::Deflate(const Size &d) const {
+   return Rect(x(), y(), w()-d.w(), h()-d.h());
+ }
+ 
+ Rect Rect::Translate(const int t) const {
+   return Rect(x()+t, y()+t, w(), h());
+ }
+ 
+ Rect Rect::Translate(const int tx, const int ty) const {
+   return Rect(x()+tx, y()+ty, w(), h());
+ }
+ 
+ Rect Rect::Translate(const Point &t) const {
+   return Rect(x()+t.x(), y()+t.y(), w(), h());
+ }
diff --cc src/Makefile.in
index 7b8d140b,47cb910a..d891d136
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc src/Resource.h
index 00000000,e75b8718..7d792494
mode 000000,100644..100644
--- a/src/Resource.h
+++ b/src/Resource.h
@@@ -1,0 -1,76 +1,76 @@@
+ // Resource.h for Openbox
+ // Copyright (c) 2002 - 2002 Ben Jansens (ben@orodu.net)
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining a
+ // copy of this software and associated documentation files (the "Software"),
+ // to deal in the Software without restriction, including without limitation
+ // the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ // and/or sell copies of the Software, and to permit persons to whom the
+ // Software is furnished to do so, subject to the following conditions:
+ //
+ // The above copyright notice and this permission notice shall be included in
+ // all copies or substantial portions of the Software.
+ //
+ // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ // DEALINGS IN THE SOFTWARE.
+ 
+ #ifndef   __Resource_hh
+ #define   __Resource_hh
+ 
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ 
+ class Resource {
+ public:
 -  explicit Resource(const std::string &file);
++  Resource(const std::string &file);
+   Resource();
+   virtual ~Resource();
+ 
+   inline const std::string &file() const {
+     return static_cast<const std::string &>(m_file);
+   }
+   void setFile(const std::string &file);
+ 
+   // defaults to true!
+   inline bool autoSave() const {
+     return m_autosave;
+   }
+   void setAutoSave(bool);
+ 
+   inline bool isModified() const {
+     return m_modified;
+   }
+ 
+   void save();
+   bool load();
+   void create();
+ 
+   void setValue(const std::string &rname, bool value);
+   void setValue(const std::string &rname, int value);
+   void setValue(const std::string &rname, long value);
+   void setValue(const std::string &rname, const std::string &value);
+   void setValue(const std::string &rname, const char *value);
+ 
+   bool getValue(const std::string &rname, const std::string &rclass,
+                 bool &value) const;
+   bool getValue(const std::string &rname, const std::string &rclass,
+                 long &value) const;
+   bool getValue(const std::string &rname, const std::string &rclass,
+                 std::string &value) const;
+ 
+ private:
+   static bool m_initialized;
+   std::string m_file;
+   bool m_modified;
+   bool m_autosave;
+   XrmDatabase m_database;
+ };
+ 
+ #endif // __Resource_hh
diff --cc src/Screen.cc
index 13c69bfa,6749c430..89cfa978
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@@ -50,12 -49,19 +49,18 @@@
  #include "Window.h"
  #include "Workspace.h"
  #include "Workspacemenu.h"
 -#include "Util.h"
  
- #ifdef    STDC_HEADERS
+ #ifdef    HAVE_STDLIB_H
  #  include <stdlib.h>
+ #endif // HAVE_STDLIB_H
+ 
+ #ifdef    HAVE_STRING_H
  #  include <string.h>
+ #endif // HAVE_STRING_H
+ 
+ #ifdef    HAVE_SYS_TYPES_H
  #  include <sys/types.h>
- #endif // STDC_HEADERS
+ #endif // HAVE_SYS_TYPES_H
  
  #ifdef    HAVE_CTYPE_H
  #  include <ctype.h>
@@@ -94,6 -100,8 +99,10 @@@
  #define   FONT_ELEMENT_SIZE 50
  #endif // FONT_ELEMENT_SIZE
  
 -#include <strstream>
++#ifdef    HAVE_SSTREAM
++#  include <sstream>
++#endif // HAVE_SSTREAM
+ #include <string>
  #include <algorithm>
  
  static Bool running = True;
@@@ -201,17 -209,17 +210,16 @@@ BScreen::BScreen(Openbox &ob, int scrn
            getDepth());
  
    rootmenu = 0;
-   resource.stylerc = 0;
  
    resource.mstyle.t_fontset = resource.mstyle.f_fontset =
-     resource.tstyle.fontset = resource.wstyle.fontset = (XFontSet) 0;
+     resource.tstyle.fontset = resource.wstyle.fontset = NULL;
    resource.mstyle.t_font = resource.mstyle.f_font = resource.tstyle.font =
-     resource.wstyle.font = (XFontStruct *) 0;
-   resource.root_command = NULL;
+     resource.wstyle.font = NULL;
 -  resource.root_command = NULL;
  
- #ifdef    HAVE_STRFTIME
-   resource.strftime_format = 0;
- #endif // HAVE_STRFTIME
+ #ifdef   SLIT
+   slit = NULL;
+ #endif // SLIT
+   toolbar = NULL;
  
  #ifdef    HAVE_GETPID
    pid_t bpid = getpid();
@@@ -237,10 -245,7 +245,9 @@@
    image_control->installRootColormap();
    root_colormap_installed = True;
  
-   openbox->load_rc(this);
- 
 +  image_control->setDither(resource.image_dither);
 +
+   load();       // load config options from Resources
    LoadStyle();
  
    XGCValues gcv;
@@@ -584,7 -591,109 +593,7 @@@ BScreen::~BScreen(void) 
  	  resource.tstyle.b_pic_gc);
  }
  
- void BScreen::readDatabaseTexture(char *rname, char *rclass,
 -
 -Rect BScreen::availableArea() const {
 -  // the following code is temporary and will be taken care of by Screen in the
 -  // future (with the NETWM 'strut')
 -  Rect space(0, 0, size().w(), size().h());
 -  if (!resource.full_max) {
 -#ifdef    SLIT
 -    int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
 -    slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
 -    int tbarh = resource.hide_toolbar ? 0 :
 -      toolbar->getExposedHeight() + resource.border_width * 2;
 -    bool tbartop;
 -    switch (toolbar->placement()) {
 -    case Toolbar::TopLeft:
 -    case Toolbar::TopCenter:
 -    case Toolbar::TopRight:
 -      tbartop = true;
 -      break;
 -    case Toolbar::BottomLeft:
 -    case Toolbar::BottomCenter:
 -    case Toolbar::BottomRight:
 -      tbartop = false;
 -      break;
 -    default:
 -      ASSERT(false);      // unhandled placement
 -    }
 -    if ((slit->direction() == Slit::Horizontal &&
 -         (slit->placement() == Slit::TopLeft ||
 -          slit->placement() == Slit::TopRight)) ||
 -        slit->placement() == Slit::TopCenter) {
 -      // exclude top
 -      if (tbartop && slit_y + slit->area().h() < tbarh) {
 -        space.setY(space.y() + tbarh);
 -        space.setH(space.h() - tbarh);
 -      } else {
 -        space.setY(space.y() + (slit_y + slit->area().h() +
 -                                resource.border_width * 2));
 -        space.setH(space.h() - (slit_y + slit->area().h() +
 -                                resource.border_width * 2));
 -        if (!tbartop)
 -          space.setH(space.h() - tbarh);
 -      }
 -    } else if ((slit->direction() == Slit::Vertical &&
 -                (slit->placement() == Slit::TopRight ||
 -                 slit->placement() == Slit::BottomRight)) ||
 -               slit->placement() == Slit::CenterRight) {
 -      // exclude right
 -      space.setW(space.w() - (size().w() - slit_x));
 -      if (tbartop)
 -        space.setY(space.y() + tbarh);
 -      space.setH(space.h() - tbarh);
 -    } else if ((slit->direction() == Slit::Horizontal &&
 -                (slit->placement() == Slit::BottomLeft ||
 -                 slit->placement() == Slit::BottomRight)) ||
 -               slit->placement() == Slit::BottomCenter) {
 -      // exclude bottom
 -      if (!tbartop && (size().h() - slit_y) < tbarh) {
 -        space.setH(space.h() - tbarh);
 -      } else {
 -        space.setH(space.h() - (size().h() - slit_y));
 -        if (tbartop) {
 -          space.setY(space.y() + tbarh);
 -          space.setH(space.h() - tbarh);
 -        }
 -      }
 -    } else {// if ((slit->direction() == Slit::Vertical &&
 -      //      (slit->placement() == Slit::TopLeft ||
 -      //       slit->placement() == Slit::BottomLeft)) ||
 -      //     slit->placement() == Slit::CenterLeft)
 -      // exclude left
 -      space.setX(slit_x + slit->area().w() +
 -                 resource.border_width * 2);
 -      space.setW(space.w() - (slit_x + slit->area().w() +
 -                              resource.border_width * 2));
 -      if (tbartop)
 -        space.setY(space.y() + tbarh);
 -      space.setH(space.h() - tbarh);
 -    }
 -#else // !SLIT
 -    int tbarh = resource.hide_toolbar() ? 0 :
 -      toolbar->getExposedHeight() + resource.border_width * 2;
 -    switch (toolbar->placement()) {
 -    case Toolbar::TopLeft:
 -    case Toolbar::TopCenter:
 -    case Toolbar::TopRight:
 -      space.setY(toolbar->getExposedHeight());
 -      space.setH(space.h() - toolbar->getExposedHeight());
 -      break;
 -    case Toolbar::BottomLeft:
 -    case Toolbar::BottomCenter:
 -    case Toolbar::BottomRight:
 -      space.setH(space.h() - tbarh);
 -      break;
 -    default:
 -      ASSERT(false);      // unhandled placement
 -    }
 -#endif // SLIT
 -  }
 -  return space;
 -}
 -
 -
+ void BScreen::readDatabaseTexture(const char *rname, const char *rclass,
  				  BTexture *texture,
  				  unsigned long default_pixel)
  {
@@@ -830,7 -928,472 +828,441 @@@ XFontSet BScreen::createFontSet(const c
  }
  
  
+ void BScreen::setSloppyFocus(bool b) {
+   resource.sloppy_focus = b;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".focusModel";
+   config.setValue(s.str(),
+                   (resource.sloppy_focus ?
+                   (resource.auto_raise ? "AutoRaiseSloppyFocus" : "SloppyFocus")
+                   : "ClickToFocus"));
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setAutoRaise(bool a) {
+   resource.auto_raise = a;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".focusModel";
+   config.setValue(s.str(),
+                   (resource.sloppy_focus ?
+                   (resource.auto_raise ? "AutoRaiseSloppyFocus" : "SloppyFocus")
+                   : "ClickToFocus"));
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
 -void BScreen::setImageDither(bool d, bool reconfig) {
++void BScreen::setImageDither(bool d) {
+   resource.image_dither = d;
 -  image_control->setDither(d);
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".imageDither" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".imageDither";
+   config.setValue(s.str(), resource.image_dither);
 -  s.rdbuf()->freeze(0);
 -  if (reconfig)
 -    reconfigure();
+ }
+ 
+ 
+ void BScreen::setOpaqueMove(bool o) {
+   resource.opaque_move = o;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".opaqueMove" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".opaqueMove";
+   config.setValue(s.str(), resource.opaque_move);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setFullMax(bool f) {
+   resource.full_max = f;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".fullMaximization" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".fullMaximization";
+   config.setValue(s.str(), resource.full_max);
++#ifndef   HAVE_SSTREAM
+   s.rdbuf()->freeze(0);
++#endif // HAVE_SSTREAM
+ }
+ 
+ 
+ void BScreen::setFocusNew(bool f) {
+   resource.focus_new = f;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".focusNewWindows" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".focusNewWindows";
+   config.setValue(s.str(), resource.focus_new);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setFocusLast(bool f) {
+   resource.focus_last = f;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".focusLastWindow" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".focusLastWindow";
+   config.setValue(s.str(), resource.focus_last);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setWindowZones(int z) {
+   resource.zones = z;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".windowZones" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".windowZones";
+   config.setValue(s.str(), resource.zones);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setWorkspaceCount(int w) {
+   resource.workspaces = w;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".workspaces" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".workspaces";
+   config.setValue(s.str(), resource.workspaces);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setPlacementPolicy(int p) {
+   resource.placement_policy = p;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".windowPlacement" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".windowPlacement";
+   const char *placement;
+   switch (resource.placement_policy) {
+   case CascadePlacement: placement = "CascadePlacement"; break;
+   case BestFitPlacement: placement = "BestFitPlacement"; break;
+   case ColSmartPlacement: placement = "ColSmartPlacement"; break;
 -  case UnderMousePlacement: placement = "UnderMousePlacement"; break;
 -  case ClickMousePlacement: placement = "ClickMousePlacement"; break;
+   default:
+   case RowSmartPlacement: placement = "RowSmartPlacement"; break;
+   }
+   config.setValue(s.str(), placement);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setEdgeSnapThreshold(int t) {
+   resource.edge_snap_threshold = t;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".edgeSnapThreshold" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".edgeSnapThreshold";
+   config.setValue(s.str(), resource.edge_snap_threshold);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setRowPlacementDirection(int d) {
+   resource.row_direction = d;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".rowPlacementDirection" <<
 -    ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".rowPlacementDirection";
+   config.setValue(s.str(),
+                   resource.row_direction == LeftRight ?
+                   "LeftToRight" : "RightToLeft");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setColPlacementDirection(int d) {
+   resource.col_direction = d;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".colPlacementDirection" <<
 -    ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".colPlacementDirection";
+   config.setValue(s.str(),
+                   resource.col_direction == TopBottom ?
+                   "TopToBottom" : "BottomToTop");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ 
+ void BScreen::setRootCommand(const char *cmd) {
+ if (resource.root_command != NULL)
+     delete [] resource.root_command;
+   if (cmd != NULL)
+     resource.root_command = bstrdup(cmd);
+   else
+     resource.root_command = NULL;
+   // this doesn't save to the Resources config because it can't be changed
+   // inside Openbox, and this way we dont add an empty command which would over-
+   // ride the styles command when none has been specified
+ }
+ 
+ 
+ #ifdef    HAVE_STRFTIME
+ void BScreen::setStrftimeFormat(const char *f) {
+   if (resource.strftime_format != NULL)
+     delete [] resource.strftime_format;
+ 
+   resource.strftime_format = bstrdup(f);
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".strftimeFormat" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".strftimeFormat";
+   config.setValue(s.str(), resource.strftime_format);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ #else // !HAVE_STRFTIME
+ void BScreen::setDateFormat(int f) {
+   resource.date_format = f;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".dateFormat" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".dateFormat";
+   config.setValue(s.str(), resource.date_format == B_EuropeanDate ?
+                   "European" : "American");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void BScreen::setClock24Hour(Bool c) {
+   resource.clock24hour = c;
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".clockFormat" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".clockFormat";
+   config.setValue(s.str(), resource.clock24hour ? 24 : 12);
 -  s.rdbuf()->freeze(0);
+ }
+ #endif // HAVE_STRFTIME
+ 
+ void BScreen::setHideToolbar(bool b) {
+   resource.hide_toolbar = b;
+   if (resource.hide_toolbar)
+     getToolbar()->unMapToolbar();
+   else
+     getToolbar()->mapToolbar();
 -  std::ostrstream s;
 -  s << "session.screen" << getScreenNumber() << ".hideToolbar" << ends;
++  std::ostringstream s;
++  s << "session.screen" << getScreenNumber() << ".hideToolbar";
+   config.setValue(s.str(), resource.hide_toolbar ? "True" : "False");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void BScreen::saveWorkspaceNames() {
 -  std::ostrstream rc, names;
++  std::ostringstream rc, names;
+ 
+   for (int i = 0; i < resource.workspaces; i++) {
+     Workspace *w = getWorkspace(i);
+     if (w != NULL) {
+       names << w->getName();
+       if (i < resource.workspaces-1)
+         names << ',';
+     }
+   }
 -  names << ends;
++  names;
+ 
 -  rc << "session.screen" << getScreenNumber() << ".workspaceNames" << ends;
++  rc << "session.screen" << getScreenNumber() << ".workspaceNames";
+   config.setValue(rc.str(), names.str());
 -  rc.rdbuf()->freeze(0);
 -  names.rdbuf()->freeze(0);
+ }
+ 
+ void BScreen::save() {
+   setSloppyFocus(resource.sloppy_focus);
+   setAutoRaise(resource.auto_raise);
 -  setImageDither(resource.image_dither, false);
++  setImageDither(resource.image_dither);
+   setOpaqueMove(resource.opaque_move);
+   setFullMax(resource.full_max);
+   setFocusNew(resource.focus_new);
+   setFocusLast(resource.focus_last);
+   setWindowZones(resource.zones);
+   setWorkspaceCount(resource.workspaces);
+   setPlacementPolicy(resource.placement_policy);
+   setEdgeSnapThreshold(resource.edge_snap_threshold);
+   setRowPlacementDirection(resource.row_direction);
+   setColPlacementDirection(resource.col_direction);
+   setRootCommand(resource.root_command);
+ #ifdef    HAVE_STRFTIME
+   // it deletes the current value before setting the new one, so we have to
+   // duplicate the current value.
+   std::string s = resource.strftime_format;
+   setStrftimeFormat(s.c_str()); 
+ #else // !HAVE_STRFTIME
+   setDateFormat(resource.date_format);
+   setClock24Hour(resource.clock24hour);
+ #endif // HAVE_STRFTIME
+   setHideToolbar(resource.hide_toolbar);
+ }
+ 
+ void BScreen::load() {
 -  std::ostrstream rscreen, rname, rclass;
++  std::ostringstream rscreen, rname, rclass;
+   std::string s;
+   bool b;
+   long l;
 -  rscreen << "session.screen" << getScreenNumber() << '.' << ends;
++  rscreen << "session.screen" << getScreenNumber() << '.';
+ 
 -  rname << rscreen.str() << "hideToolbar" << ends;
 -  rclass << rscreen.str() << "HideToolbar" << ends;
++  rname << rscreen.str() << "hideToolbar";
++  rclass << rscreen.str() << "HideToolbar";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     resource.hide_toolbar = b;
+   else
+     resource.hide_toolbar = false;
+   Toolbar *t = getToolbar();
+   if (t != NULL) {
+     if (resource.hide_toolbar)
+       t->unMapToolbar();
+     else
+       t->mapToolbar();
+   }
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "fullMaximization" << ends;
 -  rclass << rscreen.str() << "FullMaximization" << ends;
++  rname << rscreen.str() << "fullMaximization";
++  rclass << rscreen.str() << "FullMaximization";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     resource.full_max = b;
+   else
+     resource.full_max = false;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "focusNewWindows" << ends;
 -  rclass << rscreen.str() << "FocusNewWindows" << ends;
++  rname << rscreen.str() << "focusNewWindows";
++  rclass << rscreen.str() << "FocusNewWindows";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     resource.focus_new = b;
+   else
+     resource.focus_new = false;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "focusLastWindow" << ends;
 -  rclass << rscreen.str() << "FocusLastWindow" << ends;
++  rname << rscreen.str() << "focusLastWindow";
++  rclass << rscreen.str() << "FocusLastWindow";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     resource.focus_last = b;
+   else
+     resource.focus_last = false;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "rowPlacementDirection" << ends;
 -  rclass << rscreen.str() << "RowPlacementDirection" << ends;
++  rname << rscreen.str() << "rowPlacementDirection";
++  rclass << rscreen.str() << "RowPlacementDirection";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "RightToLeft", s.length()))
+       resource.row_direction = RightLeft;
 -    else //if (0 == strncasecmp(s.c_str(), "LeftToRight", s.length()))
++    else if (0 == strncasecmp(s.c_str(), "LeftToRight", s.length()))
+       resource.row_direction = LeftRight;
+   } else
+     resource.row_direction = LeftRight;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "colPlacementDirection" << ends;
 -  rclass << rscreen.str() << "ColPlacementDirection" << ends;
++  rname << rscreen.str() << "colPlacementDirection";
++  rclass << rscreen.str() << "ColPlacementDirection";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "BottomToTop", s.length()))
+       resource.col_direction = BottomTop;
 -    else //if (0 == strncasecmp(s.c_str(), "TopToBottom", s.length()))
++    else if (0 == strncasecmp(s.c_str(), "TopToBottom", s.length()))
+       resource.col_direction = TopBottom;
+   } else
+     resource.col_direction = TopBottom;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "workspaces" << ends;
 -  rclass << rscreen.str() << "Workspaces" << ends;
++  rname << rscreen.str() << "workspaces";
++  rclass << rscreen.str() << "Workspaces";
+   if (config.getValue(rname.str(), rclass.str(), l))
+     resource.workspaces = l;
+   else
+     resource.workspaces = 1;
+ 
+   removeWorkspaceNames();
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "workspaceNames" << ends;
 -  rclass << rscreen.str() << "WorkspaceNames" << ends;
++  rname << rscreen.str() << "workspaceNames";
++  rclass << rscreen.str() << "WorkspaceNames";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     std::string::const_iterator it = s.begin(), end = s.end();
+     while(1) {
+       std::string::const_iterator tmp = it;// current string.begin()
+       it = std::find(tmp, end, ',');       // look for comma between tmp and end
+       std::string name(tmp, it);           // name = s[tmp:it]
+       addWorkspaceName(name.c_str());
+       if (it == end)
+         break;
+       ++it;
+     }
+   }
+   
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "focusModel" << ends;
 -  rclass << rscreen.str() << "FocusModel" << ends;
++  rname << rscreen.str() << "focusModel";
++  rclass << rscreen.str() << "FocusModel";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "ClickToFocus", s.length())) {
+       resource.auto_raise = false;
+       resource.sloppy_focus = false;
+     } else if (0 == strncasecmp(s.c_str(), "AutoRaiseSloppyFocus",
+                                 s.length())) {
+       resource.sloppy_focus = true;
+       resource.auto_raise = true;
 -    } else { //if (0 == strncasecmp(s.c_str(), "SloppyFocus", s.length())) {
++    } else if (0 == strncasecmp(s.c_str(), "SloppyFocus", s.length())) {
+       resource.sloppy_focus = true;
+       resource.auto_raise = false;
+     }
+   } else {
+     resource.sloppy_focus = true;
+     resource.auto_raise = false;
+   }
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "windowZones" << ends;
 -  rclass << rscreen.str() << "WindowZones" << ends;
++  rname << rscreen.str() << "windowZones";
++  rclass << rscreen.str() << "WindowZones";
+   if (config.getValue(rname.str(), rclass.str(), l))
+     resource.zones = (l == 1 || l == 2 || l == 4) ? l : 1;
+   else
+     resource.zones = 4;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "windowPlacement" << ends;
 -  rclass << rscreen.str() << "WindowPlacement" << ends;
++  rname << rscreen.str() << "windowPlacement";
++  rclass << rscreen.str() << "WindowPlacement";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "RowSmartPlacement", s.length()))
+       resource.placement_policy = RowSmartPlacement;
+     else if (0 == strncasecmp(s.c_str(), "ColSmartPlacement", s.length()))
+       resource.placement_policy = ColSmartPlacement;
+     else if (0 == strncasecmp(s.c_str(), "BestFitPlacement", s.length()))
+       resource.placement_policy = BestFitPlacement;
 -    else if (0 == strncasecmp(s.c_str(), "UnderMousePlacement", s.length()))
 -      resource.placement_policy = UnderMousePlacement;
 -    else if (0 == strncasecmp(s.c_str(), "ClickMousePlacement", s.length()))
 -      resource.placement_policy = ClickMousePlacement;
 -    else //if (0 == strncasecmp(s.c_str(), "CascadePlacement", s.length()))
++    else if (0 == strncasecmp(s.c_str(), "CascadePlacement", s.length()))
+       resource.placement_policy = CascadePlacement;
+   } else
+     resource.placement_policy = CascadePlacement;
+ 
+ #ifdef    HAVE_STRFTIME
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "strftimeFormat" << ends;
 -  rclass << rscreen.str() << "StrftimeFormat" << ends;
++  rname << rscreen.str() << "strftimeFormat";
++  rclass << rscreen.str() << "StrftimeFormat";
+ 
+   if (resource.strftime_format != NULL)
+     delete [] resource.strftime_format;
+ 
+   if (config.getValue(rname.str(), rclass.str(), s))
+     resource.strftime_format = bstrdup(s.c_str());
+   else
+     resource.strftime_format = bstrdup("%I:%M %p");
+ #else // !HAVE_STRFTIME
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "dateFormat" << ends;
 -  rclass << rscreen.str() << "DateFormat" << ends;
++  rname << rscreen.str() << "dateFormat";
++  rclass << rscreen.str() << "DateFormat";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (strncasecmp(s.c_str(), "European", s.length()))
+       resource.date_format = B_EuropeanDate;
 -    else //if (strncasecmp(s.c_str(), "American", s.length()))
++    else if (strncasecmp(s.c_str(), "American", s.length()))
+       resource.date_format = B_AmericanDate;
+   } else
+     resource.date_format = B_AmericanDate;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "clockFormat" << ends;
 -  rclass << rscreen.str() << "ClockFormat" << ends;
++  rname << rscreen.str() << "clockFormat";
++  rclass << rscreen.str() << "ClockFormat";
+   if (config.getValue(rname.str(), rclass.str(), l)) {
+     if (clock == 24)
+       resource.clock24hour = true;
+     else if (clock == 12)
+       resource.clock24hour =  false;
+   } else
+     resource.clock24hour =  false;
+ #endif // HAVE_STRFTIME
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "edgeSnapThreshold" << ends;
 -  rclass << rscreen.str() << "EdgeSnapThreshold" << ends;
++  rname << rscreen.str() << "edgeSnapThreshold";
++  rclass << rscreen.str() << "EdgeSnapThreshold";
+   if (config.getValue(rname.str(), rclass.str(), l))
+     resource.edge_snap_threshold = l;
+   else
+     resource.edge_snap_threshold = 4;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "imageDither" << ends;
 -  rclass << rscreen.str() << "ImageDither" << ends;
++  rname << rscreen.str() << "imageDither";
++  rclass << rscreen.str() << "ImageDither";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     resource.image_dither = b;
+   else
+     resource.image_dither = true;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "rootCommand" << ends;
 -  rclass << rscreen.str() << "RootCommand" << ends;
++  rname << rscreen.str() << "rootCommand";
++  rclass << rscreen.str() << "RootCommand";
+ 
+   if (resource.root_command != NULL)
+     delete [] resource.root_command;
+   
+   if (config.getValue(rname.str(), rclass.str(), s))
+     resource.root_command = bstrdup(s.c_str());
+   else
+     resource.root_command = NULL;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "opaqueMove" << ends;
 -  rclass << rscreen.str() << "OpaqueMove" << ends;
++  rname << rscreen.str() << "opaqueMove";
++  rclass << rscreen.str() << "OpaqueMove";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     resource.opaque_move = b;
+   else
+     resource.opaque_move = false;
 -
 -  rscreen.rdbuf()->freeze(0);
 -  rname.rdbuf()->freeze(0);
 -  rclass.rdbuf()->freeze(0);
+ }
+ 
  void BScreen::reconfigure(void) {
+   load();
+   toolbar->load();
+ #ifdef    SLIT
+   slit->load();
+ #endif // SLIT
    LoadStyle();
  
    XGCValues gcv;
diff --cc src/Screen.h
index d49668f9,124d4f98..8acae7ee
--- a/src/Screen.h
+++ b/src/Screen.h
@@@ -173,134 -170,110 +170,108 @@@ protected
  
  
  public:
-   BScreen(Openbox *, int);
-   ~BScreen(void);
- 
-   inline const Bool &isToolbarOnTop(void) const
-   { return resource.toolbar_on_top; }
-   inline const Bool &doToolbarAutoHide(void) const
-   { return resource.toolbar_auto_hide; }
-   inline const Bool &isSloppyFocus(void) const
-   { return resource.sloppy_focus; }
-   inline const Bool &isRootColormapInstalled(void) const
-   { return root_colormap_installed; }
-   inline const Bool &doAutoRaise(void) const { return resource.auto_raise; }
-   inline const Bool &isScreenManaged(void) const { return managed; }
-   inline const Bool &doImageDither(void) const
-   { return resource.image_dither; }
-   inline const Bool &doOrderedDither(void) const
-   { return resource.ordered_dither; }
-   inline const Bool &doOpaqueMove(void) const { return resource.opaque_move; }
-   inline const Bool &doFullMax(void) const { return resource.full_max; }
-   inline const Bool &doFocusNew(void) const { return resource.focus_new; }
-   inline const Bool &doFocusLast(void) const { return resource.focus_last; }
+   BScreen(Openbox &, int, Resource &);
+   ~BScreen();
  
+   inline const Bool &isScreenManaged() const { return managed; }
    inline const GC &getOpGC() const { return opGC; }
  
-   inline Openbox *getOpenbox(void) { return openbox; }
-   inline BColor *getBorderColor(void) { return &resource.border_color; }
-   inline BImageControl *getImageControl(void) { return image_control; }
-   inline Rootmenu *getRootmenu(void) { return rootmenu; }
+   inline Openbox &getOpenbox() { return openbox; }
+   inline BColor *getBorderColor() { return &resource.border_color; }
+   inline BImageControl *getImageControl() { return image_control; }
+   inline Rootmenu *getRootmenu() { return rootmenu; }
  
  #ifdef   SLIT
-   inline const Bool &isSlitOnTop(void) const { return resource.slit_on_top; }
-   inline const Bool &doSlitAutoHide(void) const
-   { return resource.slit_auto_hide; }
-   inline Slit *getSlit(void) { return slit; }
-   inline const int &getSlitPlacement(void) const
-   { return resource.slit_placement; }
-   inline const int &getSlitDirection(void) const
-   { return resource.slit_direction; }
-   inline void saveSlitPlacement(int p) { resource.slit_placement = p; }
-   inline void saveSlitDirection(int d) { resource.slit_direction = d; }
-   inline void saveSlitOnTop(Bool t)    { resource.slit_on_top = t; }
-   inline void saveSlitAutoHide(Bool t) { resource.slit_auto_hide = t; }
+   inline Slit *getSlit() { return slit; }
  #endif // SLIT
  
-   inline int getWindowZones(void) const
-   { return resource.zones; }
-   inline void saveWindowZones(int z) { resource.zones = z; }
-   
-   inline Toolbar *getToolbar(void) { return toolbar; }
+   inline Toolbar *getToolbar() { return toolbar; }
  
 -  Rect availableArea() const;
 -  
    inline Workspace *getWorkspace(int w) { return workspacesList->find(w); }
-   inline Workspace *getCurrentWorkspace(void) { return current_workspace; }
+   inline Workspace *getCurrentWorkspace() { return current_workspace; }
  
-   inline Workspacemenu *getWorkspacemenu(void) { return workspacemenu; }
+   inline Workspacemenu *getWorkspacemenu() { return workspacemenu; }
+   
+   inline void iconUpdate() { iconmenu->update(); }
  
-   inline const unsigned int &getHandleWidth(void) const
+   inline const unsigned int &getHandleWidth() const
    { return resource.handle_width; }
-   inline const unsigned int &getBevelWidth(void) const
+   inline const unsigned int &getBevelWidth() const
    { return resource.bevel_width; }
-   inline const unsigned int &getFrameWidth(void) const
+   inline const unsigned int &getFrameWidth() const
    { return resource.frame_width; }
-   inline const unsigned int &getBorderWidth(void) const
+   inline const unsigned int &getBorderWidth() const
    { return resource.border_width; }
  
    inline const int getCurrentWorkspaceID()
    { return current_workspace->getWorkspaceID(); }
-   inline const int getCount(void) { return workspacesList->count(); }
-   inline const int getIconCount(void) { return iconList->count(); }
-   inline const int &getNumberOfWorkspaces(void) const
-   { return resource.workspaces; }
-   inline const int &getToolbarPlacement(void) const
-   { return resource.toolbar_placement; }
-   inline const int &getToolbarWidthPercent(void) const
-   { return resource.toolbar_width_percent; }
-   inline const int &getPlacementPolicy(void) const
-   { return resource.placement_policy; }
-   inline const int &getEdgeSnapThreshold(void) const
-   { return resource.edge_snap_threshold; }
-   inline const int &getRowPlacementDirection(void) const
-   { return resource.row_direction; }
-   inline const int &getColPlacementDirection(void) const
-   { return resource.col_direction; }
- 
-   inline void saveRootCommand(const char *cmd) {
-     if (resource.root_command != NULL)
-       delete [] resource.root_command;
-     if (cmd != NULL)
-       resource.root_command = bstrdup(cmd);
-     else
-       resource.root_command = NULL;
-   }
-   inline const char *getRootCommand(void) const
-   { return resource.root_command; }
-   
+   inline const int getWorkspaceCount() { return workspacesList->count(); }
+   inline const int getIconCount() { return iconList->count(); }
+ 
+   inline const Bool &isRootColormapInstalled() const
+     { return root_colormap_installed; }
    inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; }
-   inline void saveSloppyFocus(Bool s) { resource.sloppy_focus = s; }
-   inline void saveAutoRaise(Bool a) { resource.auto_raise = a; }
-   inline void saveWorkspaces(int w) { resource.workspaces = w; }
-   inline void saveToolbarOnTop(Bool r) { resource.toolbar_on_top = r; }
-   inline void saveToolbarAutoHide(Bool r) { resource.toolbar_auto_hide = r; }
-   inline void saveToolbarWidthPercent(int w)
-   { resource.toolbar_width_percent = w; }
-   inline void saveToolbarPlacement(int p) { resource.toolbar_placement = p; }
-   inline void savePlacementPolicy(int p) { resource.placement_policy = p; }
-   inline void saveRowPlacementDirection(int d) { resource.row_direction = d; }
-   inline void saveColPlacementDirection(int d) { resource.col_direction = d; }
-   inline void saveEdgeSnapThreshold(int t)
-   { resource.edge_snap_threshold = t; }
-   inline void saveImageDither(Bool d) { resource.image_dither = d; }
-   inline void saveOpaqueMove(Bool o) { resource.opaque_move = o; }
-   inline void saveFullMax(Bool f) { resource.full_max = f; }
-   inline void saveFocusNew(Bool f) { resource.focus_new = f; }
-   inline void saveFocusLast(Bool f) { resource.focus_last = f; }
-   inline void iconUpdate(void) { iconmenu->update(); }
+   
+   inline bool sloppyFocus() const { return resource.sloppy_focus; }
+   void setSloppyFocus(bool s);
+   
+   inline bool autoRaise() const { return resource.auto_raise; }
+   void setAutoRaise(bool a);
+   
+   inline bool imageDither() const { return resource.image_dither; }
 -  void setImageDither(bool d, bool reconfig = true);
++  void setImageDither(bool d);
+   
+   inline bool orderedDither() const { return resource.ordered_dither; }
+   
+   inline bool opaqueMove() const { return resource.opaque_move; }
+   void setOpaqueMove(bool o);
+   
+   inline bool fullMax() const { return resource.full_max; }
+   void setFullMax(bool f);
+   
+   inline bool focusNew() const { return resource.focus_new; }
+   void setFocusNew(bool f);
+   
+   inline bool focusLast() const { return resource.focus_last; }
+   void setFocusLast(bool f);
+   
+   inline int getWindowZones() const { return resource.zones; }
+   void setWindowZones(int z);
+   
+   inline int workspaceCount() const { return resource.workspaces; }
+   void setWorkspaceCount(int w);
+ 
+   inline int placementPolicy() const { return resource.placement_policy; }
+   void setPlacementPolicy(int p);
  
+   inline int edgeSnapThreshold() const { return resource.edge_snap_threshold; }
+   void setEdgeSnapThreshold(int t);
+   
+   inline int rowPlacementDirection() const { return resource.row_direction; }
+   void setRowPlacementDirection(int d);
+   
+   inline int colPlacementDirection() const { return resource.col_direction; }
+   void setColPlacementDirection(int d);
+   
+   inline char *rootCommand() const { return resource.root_command; }
+   inline void setRootCommand(const char *cmd);
+   
  #ifdef    HAVE_STRFTIME
-   inline char *getStrftimeFormat(void) { return resource.strftime_format; }
-   void saveStrftimeFormat(char *);
+   inline char *strftimeFormat() { return resource.strftime_format; }
+   void setStrftimeFormat(const char *);
  #else // !HAVE_STRFTIME
-   inline int getDateFormat(void) { return resource.date_format; }
-   inline void saveDateFormat(int f) { resource.date_format = f; }
-   inline Bool isClock24Hour(void) { return resource.clock24hour; }
-   inline void saveClock24Hour(Bool c) { resource.clock24hour = c; }
+   inline int dateFormat() { return resource.date_format; }
+   void setDateFormat(int f);
+   inline bool clock24Hour() { return resource.clock24hour; }
+   void setClock24Hour(Bool c);
  #endif // HAVE_STRFTIME
  
-   inline WindowStyle *getWindowStyle(void) { return &resource.wstyle; }
-   inline MenuStyle *getMenuStyle(void) { return &resource.mstyle; }
-   inline ToolbarStyle *getToolbarStyle(void) { return &resource.tstyle; }
+   inline bool hideToolbar() const { return resource.hide_toolbar; }
+   void setHideToolbar(bool);
+ 
+   inline WindowStyle *getWindowStyle() { return &resource.wstyle; }
+   inline MenuStyle *getMenuStyle() { return &resource.mstyle; }
+   inline ToolbarStyle *getToolbarStyle() { return &resource.tstyle; }
  
    OpenboxWindow *getIcon(int);
  
@@@ -336,8 -311,9 +309,8 @@@
    void updateNetizenWindowRaise(Window);
    void updateNetizenWindowLower(Window);
  
-   enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight,
-          RightLeft, TopBottom, BottomTop };
+   enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
 -         BestFitPlacement, UnderMousePlacement, ClickMousePlacement,
 -         LeftRight, RightLeft, TopBottom, BottomTop };
++         BestFitPlacement, LeftRight, RightLeft, TopBottom, BottomTop };
    enum { LeftJustify = 1, RightJustify, CenterJustify };
    enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
    enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,
diff --cc src/Slit.cc
index 2eb940e7,d9ffc167..8f5200f5
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@@ -41,24 -41,22 +41,27 @@@
  #include "Slit.h"
  #include "Toolbar.h"
  
- 
- Slit::Slit(BScreen *scr) {
-   screen = scr;
-   openbox = screen->getOpenbox();
- 
-   on_top = screen->isSlitOnTop();
-   hidden = do_auto_hide = screen->doSlitAutoHide();
- 
-   display = screen->getBaseDisplay()->getXDisplay();
++#ifdef    HAVE_SSTREAM
++#  include <sstream>
++#endif // HAVE_SSTREAM
++
+ #include <string>
 -#include <strstream>
+ 
+ Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
+   openbox(scr.getOpenbox()), config(conf)
+ {
+   load();
+   
+   display = screen.getBaseDisplay().getXDisplay();
    frame.window = frame.pixmap = None;
  
-   timer = new BTimer(openbox, this);
-   timer->setTimeout(openbox->getAutoRaiseDelay());
+   timer = new BTimer(openbox, *this);
+   timer->setTimeout(openbox.getAutoRaiseDelay());
    timer->fireOnce(True);
  
 +  clientList = new LinkedList<SlitClient>;
 +
-   slitmenu = new Slitmenu(this);
+   slitmenu = new Slitmenu(*this);
  
    XSetWindowAttributes attrib;
    unsigned long create_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
@@@ -91,12 -89,13 +94,12 @@@ Slit::~Slit() 
    if (timer->isTiming()) timer->stop();
    delete timer;
  
 -  clientList.clear();
 -  
 +  delete clientList;
    delete slitmenu;
  
-   screen->getImageControl()->removeImage(frame.pixmap);
+   screen.getImageControl()->removeImage(frame.pixmap);
  
-   openbox->removeSlitSearch(frame.window);
+   openbox.removeSlitSearch(frame.window);
  
    XDestroyWindow(display, frame.window);
  
@@@ -156,10 -155,10 +159,10 @@@ void Slit::addClient(Window w) 
                   SubstructureNotifyMask | EnterWindowMask);
      XFlush(display);
  
 -    clientList.push_back(client);
 +    clientList->insert(client);
  
-     openbox->saveSlitSearch(client->client_window, this);
-     openbox->saveSlitSearch(client->icon_window, this);
+     openbox.saveSlitSearch(client->client_window, this);
+     openbox.saveSlitSearch(client->icon_window, this);
      reconfigure();
    }
  
@@@ -168,16 -167,17 +171,16 @@@
  
  
  void Slit::removeClient(SlitClient *client, Bool remap) {
-   openbox->removeSlitSearch(client->client_window);
-   openbox->removeSlitSearch(client->icon_window);
+   openbox.removeSlitSearch(client->client_window);
+   openbox.removeSlitSearch(client->icon_window);
 -
 -  clientList.remove(client);
 +  clientList->remove(client);
  
-   screen->removeNetizen(client->window);
+   screen.removeNetizen(client->window);
  
-   if (remap && openbox->validateWindow(client->window)) {
+   if (remap && openbox.validateWindow(client->window)) {
      XSelectInput(display, frame.window, NoEventMask);
      XSelectInput(display, client->window, NoEventMask);
-     XReparentWindow(display, client->window, screen->getRootWindow(),
+     XReparentWindow(display, client->window, screen.getRootWindow(),
  		    client->x, client->y);
      XChangeSaveSet(display, client->window, SetModeDelete);
      XSelectInput(display, frame.window, SubstructureRedirectMask |
@@@ -195,77 -195,186 +198,178 @@@ void Slit::removeClient(Window w, Bool 
  
    Bool reconf = False;
  
 -  slitClientList::iterator it;
 -  for (it = clientList.begin(); it != clientList.end(); it++)
 -    if ((*it)->window == w) {
 -      removeClient(*it, remap);
 +  LinkedListIterator<SlitClient> it(clientList);
 +  for (SlitClient *tmp = it.current(); tmp; it++, tmp = it.current()) {
 +    if (tmp->window == w) {
 +      removeClient(tmp, remap);
        reconf = True;
 +
        break;
      }
 +  }
  
 -  if (reconf)
 -    reconfigure();
 +  if (reconf) reconfigure();
  
-   openbox->ungrab();
+   openbox.ungrab();
+ }
+ 
+ void Slit::setOnTop(bool b) {
+   m_ontop = b;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".slit.onTop";
+   config.setValue(s.str(), m_ontop ? "True" : "False");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Slit::setAutoHide(bool b) {
+   m_autohide = b;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide";
+   config.setValue(s.str(), m_autohide ? "True" : "False");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Slit::setPlacement(int p) {
+   m_placement = p;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
 -    ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".slit.placement";
+   const char *placement;
+   switch (m_placement) {
+   case TopLeft: placement = "TopLeft"; break;
+   case CenterLeft: placement = "CenterLeft"; break;
+   case BottomLeft: placement = "BottomLeft"; break;
+   case TopCenter: placement = "TopCenter"; break;
+   case BottomCenter: placement = "BottomCenter"; break;
+   case TopRight: placement = "TopRight"; break;
+   case BottomRight: placement = "BottomRight"; break;
+   case CenterRight: default: placement = "CenterRight"; break;
+   }
+   config.setValue(s.str(), placement);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Slit::setDirection(int d) {
+   m_direction = d;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".slit.direction" <<
 -    ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".slit.direction";
+   config.setValue(s.str(),
+                   m_direction == Horizontal ? "Horizontal" : "Vertical");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Slit::save() {
+   setOnTop(m_ontop);
+   setAutoHide(m_autohide);
+   setPlacement(m_placement);
+   setDirection(m_direction);
  }
  
+ void Slit::load() {
 -  std::ostrstream rscreen, rname, rclass;
++  std::ostringstream rscreen, rname, rclass;
+   std::string s;
+   bool b;
 -  rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
++  rscreen << "session.screen" << screen.getScreenNumber() << '.';
+ 
 -  rname << rscreen.str() << "slit.placement" << ends;
 -  rclass << rscreen.str() << "Slit.Placement" << ends;
++  rname << rscreen.str() << "slit.placement";
++  rclass << rscreen.str() << "Slit.Placement";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
+       m_placement = TopLeft;
+     else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length()))
+       m_placement = CenterLeft;
+     else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length()))
+       m_placement = BottomLeft;
+     else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length()))
+       m_placement = TopCenter;
+     else if (0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
+       m_placement = BottomCenter;
+     else if (0 == strncasecmp(s.c_str(), "TopRight", s.length()))
+       m_placement = TopRight;
+     else if (0 == strncasecmp(s.c_str(), "BottomRight", s.length()))
+       m_placement = BottomRight;
+     else if (0 == strncasecmp(s.c_str(), "CenterRight", s.length()))
+       m_placement = CenterRight;
+   } else
+     m_placement = CenterRight;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "slit.direction" << ends;
 -  rclass << rscreen.str() << "Slit.Direction" << ends;
++  rname << rscreen.str() << "slit.direction";
++  rclass << rscreen.str() << "Slit.Direction";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "Horizontal", s.length()))
+       m_direction = Horizontal;
+     else if (0 == strncasecmp(s.c_str(), "Vertical", s.length()))
+       m_direction = Vertical;
+   } else
+     m_direction = Vertical;
+  
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "slit.onTop" << ends;
 -  rclass << rscreen.str() << "Slit.OnTop" << ends;
++  rname << rscreen.str() << "slit.onTop";
++  rclass << rscreen.str() << "Slit.OnTop";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     m_ontop = b;
+   else
+     m_ontop = false;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "slit.autoHide" << ends;
 -  rclass << rscreen.str() << "Slit.AutoHide" << ends;
++  rname << rscreen.str() << "slit.autoHide";
++  rclass << rscreen.str() << "Slit.AutoHide";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     m_hidden = m_autohide = b;
+   else
+     m_hidden = m_autohide = false;
 -
 -  rscreen.rdbuf()->freeze(0);
 -  rname.rdbuf()->freeze(0);
 -  rclass.rdbuf()->freeze(0);
+ }
  
  void Slit::reconfigure(void) {
-   frame.width = 0;
-   frame.height = 0;
+   frame.area.setSize(0, 0);
 -  slitClientList::const_iterator it;
 +  LinkedListIterator<SlitClient> it(clientList);
 +  SlitClient *client;
  
-   switch (screen->getSlitDirection()) {
+   switch (m_direction) {
    case Vertical:
 -    for (it = clientList.begin(); it != clientList.end(); it++) {
 -      frame.area.setH(frame.area.h() + (*it)->height + screen.getBevelWidth());
 +    for (client = it.current(); client; it++, client = it.current()) {
-       frame.height += client->height + screen->getBevelWidth();
++      frame.area.setH(frame.area.h() + client->height + screen.getBevelWidth());
  
-       if (frame.width < client->width)
-         frame.width = client->width;
 -      if (frame.area.w() < (*it)->width)
 -        frame.area.setW((*it)->width);
++      if (frame.area.w() < client->width)
++        frame.area.setW(client->width);
      }
  
-     if (frame.width < 1)
-       frame.width = 1;
+     if (frame.area.w() < 1)
+       frame.area.setW(1);
      else
-       frame.width += (screen->getBevelWidth() * 2);
+       frame.area.setW(frame.area.w() + (screen.getBevelWidth() * 2));
  
-     if (frame.height < 1)
-       frame.height = 1;
+     if (frame.area.h() < 1)
+       frame.area.setH(1);
      else
-       frame.height += screen->getBevelWidth();
+       frame.area.setH(frame.area.h() + screen.getBevelWidth());
  
      break;
  
    case Horizontal:
 -    for (it = clientList.begin(); it != clientList.end(); it++) {
 -      frame.area.setW(frame.area.w() + (*it)->width + screen.getBevelWidth());
 +    for (client = it.current(); client; it++, client = it.current()) {
-       frame.width += client->width + screen->getBevelWidth();
++      frame.area.setW(frame.area.w() + client->width + screen.getBevelWidth());
  
-       if (frame.height < client->height)
-         frame.height = client->height;
 -      if (frame.area.h() < (*it)->height)
 -        frame.area.setH((*it)->height);
++      if (frame.area.h() < client->height)
++        frame.area.setH(client->height);
      }
  
-     if (frame.width < 1)
-       frame.width = 1;
+     if (frame.area.w() < 1)
+       frame.area.setW(1);
      else
-       frame.width += screen->getBevelWidth();
+       frame.area.setW(frame.area.w() + screen.getBevelWidth());
  
-     if (frame.height < 1)
-       frame.height = 1;
+     if (frame.area.h() < 1)
+       frame.area.setH(1);
      else
-       frame.height += (screen->getBevelWidth() * 2);
+       frame.area.setH(frame.area.h() + (screen.getBevelWidth() * 2));
  
      break;
    }
  
    reposition();
  
-   XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth());
+   XSetWindowBorderWidth(display ,frame.window, screen.getBorderWidth());
    XSetWindowBorder(display, frame.window,
-                    screen->getBorderColor()->getPixel());
+                    screen.getBorderColor()->getPixel());
  
 -  if (! clientList.size())
 +  if (! clientList->count())
      XUnmapWindow(display, frame.window);
    else
      XMapWindow(display, frame.window);
@@@ -286,23 -395,22 +390,23 @@@
    XClearWindow(display, frame.window);
  
    int x, y;
 +  it.reset();
  
-   switch (screen->getSlitDirection()) {
+   switch (m_direction) {
    case Vertical:
      x = 0;
-     y = screen->getBevelWidth();
+     y = screen.getBevelWidth();
  
 -    for (it = clientList.begin(); it != clientList.end(); it++) {
 -      x = (frame.area.w() - (*it)->width) / 2;
 +    for (client = it.current(); client; it++, client = it.current()) {
-       x = (frame.width - client->width) / 2;
++      x = (frame.area.w() - client->width) / 2;
  
 -      XMoveResizeWindow(display, (*it)->window, x, y,
 -                        (*it)->width, (*it)->height);
 -      XMapWindow(display, (*it)->window);
 +      XMoveResizeWindow(display, client->window, x, y,
 +                        client->width, client->height);
 +      XMapWindow(display, client->window);
  
        // for ICCCM compliance
 -      (*it)->x = x;
 -      (*it)->y = y;
 +      client->x = x;
 +      client->y = y;
  
        XEvent event;
        event.type = ConfigureNotify;
@@@ -318,27 -426,27 +422,27 @@@
        event.xconfigure.above = frame.window;
        event.xconfigure.override_redirect = False;
  
 -      XSendEvent(display, (*it)->window, False, StructureNotifyMask, &event);
 +      XSendEvent(display, client->window, False, StructureNotifyMask, &event);
  
-       y += client->height + screen->getBevelWidth();
 -      y += (*it)->height + screen.getBevelWidth();
++      y += client->height + screen.getBevelWidth();
      }
  
      break;
  
    case Horizontal:
-     x = screen->getBevelWidth();
+     x = screen.getBevelWidth();
      y = 0;
  
 -    for (it = clientList.begin(); it != clientList.end(); it++) {
 -      y = (frame.area.h() - (*it)->height) / 2;
 +    for (client = it.current(); client; it++, client = it.current()) {
-       y = (frame.height - client->height) / 2;
++      y = (frame.area.h() - client->height) / 2;
  
 -      XMoveResizeWindow(display, (*it)->window, x, y,
 -                        (*it)->width, (*it)->height);
 -      XMapWindow(display, (*it)->window);
 +      XMoveResizeWindow(display, client->window, x, y,
 +                        client->width, client->height);
 +      XMapWindow(display, client->window);
  
        // for ICCCM compliance
 -      (*it)->x = x;
 -      (*it)->y = y;
 +      client->x = x;
 +      client->y = y;
  
        XEvent event;
        event.type = ConfigureNotify;
@@@ -354,9 -462,9 +458,9 @@@
        event.xconfigure.above = frame.window;
        event.xconfigure.override_redirect = False;
  
 -      XSendEvent(display, (*it)->window, False, StructureNotifyMask, &event);
 +      XSendEvent(display, client->window, False, StructureNotifyMask, &event);
  
-       x += client->width + screen->getBevelWidth();
 -      x += (*it)->width + screen.getBevelWidth();
++      x += client->width + screen.getBevelWidth();
      }
  
      break;
@@@ -586,17 -676,15 +672,17 @@@ void Slit::configureRequestEvent(XConfi
              client->height != ((unsigned) e->height)) {
            client->width = (unsigned) e->width;
            client->height = (unsigned) e->height;
 +
            reconf = True;
 +
            break;
          }
 -    }
  
 -    if (reconf)
 -      reconfigure();
 +    if (reconf) reconfigure();
 +
    }
 +
-   openbox->ungrab();
+   openbox.ungrab();
  }
  
  
diff --cc src/Slit.h
index 1cb89751,b07d9c6c..89d76daf
--- a/src/Slit.h
+++ b/src/Slit.h
@@@ -27,7 -27,8 +27,8 @@@
  #include <X11/Xutil.h>
  
  #include "Basemenu.h"
 +#include "LinkedList.h"
+ #include "Geometry.h"
 -#include <list>
  
  // forward declaration
  class Slit;
@@@ -93,14 -96,17 +96,16 @@@ private
      unsigned int width, height;
    };
  
-   Bool on_top, hidden, do_auto_hide;
+   bool m_ontop, m_autohide, m_hidden;
+   int m_direction, m_placement; 
    Display *display;
  
-   Openbox *openbox;
-   BScreen *screen;
+   Openbox &openbox;
+   BScreen &screen;
+   Resource &config;
    BTimer *timer;
  
 -  typedef std::list<SlitClient *> slitClientList;
 -  slitClientList clientList;
 +  LinkedList<SlitClient> *clientList;
    Slitmenu *slitmenu;
  
    struct frame {
diff --cc src/Toolbar.cc
index d2e39c85,9f4231aa..32c28642
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@@ -63,13 -62,16 +62,19 @@@
  # endif // HAVE_SYS_TIME_H
  #endif // TIME_WITH_SYS_TIME
  
 -#include <strstream>
++#ifdef    HAVE_SSTREAM
++#  include <sstream>
++#endif // HAVE_SSTREAM
 +
- Toolbar::Toolbar(BScreen *scrn) {
-   screen = scrn;
-   openbox = screen->getOpenbox();
+ #include <string>
+ 
+ Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
+   openbox(scrn.getOpenbox()), config(conf)
+ {
+   load();
  
    // get the clock updating every minute
-   clock_timer = new BTimer(openbox, this);
+   clock_timer = new BTimer(openbox, *this);
    timeval now;
    gettimeofday(&now, 0);
    clock_timer->setTimeout((60 - (now.tv_sec % 60)) * 1000);
@@@ -189,9 -212,114 +215,104 @@@ Toolbar::~Toolbar() 
  }
  
  
- void Toolbar::reconfigure(void) {
-   frame.bevel_w = screen->getBevelWidth();
-   frame.width = screen->getWidth() * screen->getToolbarWidthPercent() / 100;
+ void Toolbar::setOnTop(bool b) {
+   m_ontop = b;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop";
+   config.setValue(s.str(), m_ontop ? "True" : "False");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Toolbar::setAutoHide(bool b) {
+   m_autohide = b;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide" <<
 -    ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide";
+   config.setValue(s.str(), m_autohide ? "True" : "False");
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Toolbar::setWidthPercent(int w) {
+   m_width_percent = w;
 -  std::ostrstream s;
++  std::ostringstream s;
+   s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent"
 -    << ends;
++   ;
+   config.setValue(s.str(), m_width_percent);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Toolbar::setPlacement(int p) {
+   m_placement = p;
 -  std::ostrstream s;
 -  s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement" <<
 -    ends;
++  std::ostringstream s;
++  s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement";
+   const char *placement;
+   switch (m_placement) {
+   case TopLeft: placement = "TopLeft"; break;
+   case BottomLeft: placement = "BottomLeft"; break;
+   case TopCenter: placement = "TopCenter"; break;
+   case TopRight: placement = "TopRight"; break;
+   case BottomRight: placement = "BottomRight"; break;
+   case BottomCenter: default: placement = "BottomCenter"; break;
+   }
+   config.setValue(s.str(), placement);
 -  s.rdbuf()->freeze(0);
+ }
+ 
+ void Toolbar::save() {
+   setOnTop(m_ontop);
+   setAutoHide(m_autohide);
+   setWidthPercent(m_width_percent);
+   setPlacement(m_placement);
+ }
+ 
+ void Toolbar::load() {
 -  std::ostrstream rscreen, rname, rclass;
++  std::ostringstream rscreen, rname, rclass;
+   std::string s;
+   bool b;
+   long l;
 -  rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
++  rscreen << "session.screen" << screen.getScreenNumber() << '.';
+ 
 -  rname << rscreen.str() << "toolbar.widthPercent" << ends;
 -  rclass << rscreen.str() << "Toolbar.WidthPercent" << ends;
++  rname << rscreen.str() << "toolbar.widthPercent";
++  rclass << rscreen.str() << "Toolbar.WidthPercent";
+   if (config.getValue(rname.str(), rclass.str(), l) && (l > 0 && l <= 100))
+     m_width_percent = l;
+   else
+     m_width_percent =66;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "toolbar.placement" << ends;
 -  rclass << rscreen.str() << "Toolbar.Placement" << ends;
++  rname << rscreen.str() << "toolbar.placement";
++  rclass << rscreen.str() << "Toolbar.Placement";
+   if (config.getValue(rname.str(), rclass.str(), s)) {
+     if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
+       m_placement = TopLeft;
+     else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length()))
+       m_placement = BottomLeft;
+     else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length()))
+       m_placement = TopCenter;
+     else if (0 == strncasecmp(s.c_str(), "TopRight", s.length()))
+       m_placement = TopRight;
+     else if ( 0 == strncasecmp(s.c_str(), "BottomRight", s.length()))
+       m_placement = BottomRight;
+     else if ( 0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
+       m_placement = BottomCenter;
+   } else
+     m_placement = BottomCenter;
+   
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "toolbar.onTop" << ends;
 -  rclass << rscreen.str() << "Toolbar.OnTop" << ends;
++  rname << rscreen.str() << "toolbar.onTop";
++  rclass << rscreen.str() << "Toolbar.OnTop";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     m_ontop = b;
+   else
+     m_ontop = false;
+ 
+   rname.seekp(0); rclass.seekp(0);
 -  rname << rscreen.str() << "toolbar.autoHide" << ends;
 -  rclass << rscreen.str() << "Toolbar.AutoHide" << ends;
++  rname << rscreen.str() << "toolbar.autoHide";
++  rclass << rscreen.str() << "Toolbar.AutoHide";
+   if (config.getValue(rname.str(), rclass.str(), b))
+     m_hidden = m_autohide = b;
+   else
+     m_hidden = m_autohide = false;
 -
 -  rscreen.rdbuf()->freeze(0);
 -  rname.rdbuf()->freeze(0);
 -  rclass.rdbuf()->freeze(0);
+ }
+ 
+ void Toolbar::reconfigure() {
+   frame.bevel_w = screen.getBevelWidth();
+   frame.width = screen.size().w() * m_width_percent / 100;
    
    if (i18n->multibyte())
      frame.height =
@@@ -267,8 -395,11 +388,10 @@@
    if (ttmp != -1) {
      tt = localtime(&ttmp);
      if (tt) {
-       char t[1024], *time_string = (char *) 0;
-       int len = strftime(t, 1024, screen->getStrftimeFormat(), tt);
+       char t[1025], *time_string = (char *) 0;
+       int len = strftime(t, 1024, screen.strftimeFormat(), tt);
 -      t[len++] = 'A';   // add size to the string for padding
 -      t[len++] = 'A';   // add size to the string for padding
++      t[len++-1] = ' ';   // add a space to the string for padding
+       t[len] = '\0';
  
        if (i18n->multibyte()) {
          XRectangle ink, logical;
diff --cc src/Window.cc
index 4133ac00,48052658..d5e3293d
--- a/src/Window.cc
+++ b/src/Window.cc
@@@ -217,17 -216,17 +216,17 @@@ OpenboxWindow::OpenboxWindow(Openbox &o
    }
    upsize();
  
 -  place_window = true;
 +  Bool place_window = True;
-   if (openbox->isStartup() || flags.transient ||
+   if (openbox.isStartup() || flags.transient ||
        client.normal_hint_flags & (PPosition|USPosition)) {
      setGravityOffsets();
  
-     if ((openbox->isStartup()) ||
+     if ((openbox.isStartup()) ||
  	(frame.x >= 0 &&
  	 (signed) (frame.y + frame.y_border) >= 0 &&
- 	 frame.x <= (signed) screen->getWidth() &&
- 	 frame.y <= (signed) screen->getHeight()))
+ 	 frame.x <= (signed) screen->size().w() &&
+ 	 frame.y <= (signed) screen->size().h()))
 -      place_window = false;
 +      place_window = False;
    }
  
    frame.window = createToplevelWindow(frame.x, frame.y, frame.width,
@@@ -1466,7 -1468,19 +1465,7 @@@ void OpenboxWindow::deiconify(Bool reas
    XMapSubwindows(display, frame.window);
    XMapWindow(display, frame.window);
  
-   if (flags.iconic && screen->doFocusNew()) setInputFocus();
 -  // if we're using the click to place placement type, then immediately
 -  // after the window is mapped, we need to start interactively moving it
 -  if (initial && place_window &&
 -      screen->placementPolicy() == BScreen::ClickMousePlacement) {
 -    int x, y, rx, ry;
 -    Window c, r;
 -    unsigned int m;
 -    XQueryPointer(openbox.getXDisplay(), screen->getRootWindow(),
 -                  &r, &c, &rx, &ry, &x, &y, &m);
 -    startMove(rx, ry);
 -  }
 -  
+   if (flags.iconic && screen->focusNew()) setInputFocus();
  
    flags.visible = True;
    flags.iconic = False;
@@@ -1534,15 -1554,14 +1533,113 @@@ void OpenboxWindow::maximize(unsigned i
      return;
    }
  
-   int dx = 0, dy = 0;
-   unsigned int dw, dh;
++  // the following code is temporary and will be taken care of by Screen in the
++  // future (with the NETWM 'strut')
++  Rect space(0, 0, screen->size().w(), screen->size().h());
++  if (! screen->fullMax()) {
++#ifdef    SLIT
++    Slit *slit = screen->getSlit();
++    int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
++        slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
++    Toolbar *toolbar = screen->getToolbar();
++    int tbarh = screen->hideToolbar() ? 0 :
++      toolbar->getExposedHeight() + screen->getBorderWidth() * 2;
++    bool tbartop;
++    switch (toolbar->placement()) {
++    case Toolbar::TopLeft:
++    case Toolbar::TopCenter:
++    case Toolbar::TopRight:
++      tbartop = true;
++      break;
++    case Toolbar::BottomLeft:
++    case Toolbar::BottomCenter:
++    case Toolbar::BottomRight:
++      tbartop = false;
++      break;
++    default:
++      ASSERT(false);      // unhandled placement
++    }
++    if ((slit->direction() == Slit::Horizontal &&
++         (slit->placement() == Slit::TopLeft ||
++          slit->placement() == Slit::TopRight)) ||
++        slit->placement() == Slit::TopCenter) {
++      // exclude top
++      if (tbartop && slit_y + slit->area().h() < tbarh) {
++        space.setY(space.y() + tbarh);
++        space.setH(space.h() - tbarh);
++      } else {
++        space.setY(space.y() + (slit_y + slit->area().h() +
++                                screen->getBorderWidth() * 2));
++        space.setH(space.h() - (slit_y + slit->area().h() +
++                                screen->getBorderWidth() * 2));
++        if (!tbartop)
++          space.setH(space.h() - tbarh);
++      }
++    } else if ((slit->direction() == Slit::Vertical &&
++              (slit->placement() == Slit::TopRight ||
++               slit->placement() == Slit::BottomRight)) ||
++             slit->placement() == Slit::CenterRight) {
++      // exclude right
++      space.setW(space.w() - (screen->size().w() - slit_x));
++      if (tbartop)
++        space.setY(space.y() + tbarh);
++      space.setH(space.h() - tbarh);
++    } else if ((slit->direction() == Slit::Horizontal &&
++              (slit->placement() == Slit::BottomLeft ||
++               slit->placement() == Slit::BottomRight)) ||
++             slit->placement() == Slit::BottomCenter) {
++      // exclude bottom
++      if (!tbartop && (screen->size().h() - slit_y) < tbarh) {
++        space.setH(space.h() - tbarh);
++      } else {
++        space.setH(space.h() - (screen->size().h() - slit_y));
++        if (tbartop) {
++          space.setY(space.y() + tbarh);
++          space.setH(space.h() - tbarh);
++        }
++      }
++    } else {// if ((slit->direction() == Slit::Vertical &&
++      //      (slit->placement() == Slit::TopLeft ||
++      //       slit->placement() == Slit::BottomLeft)) ||
++      //     slit->placement() == Slit::CenterLeft)
++      // exclude left
++      space.setX(slit_x + slit->area().w() +
++                 screen->getBorderWidth() * 2);
++      space.setW(space.w() - (slit_x + slit->area().w() +
++                              screen->getBorderWidth() * 2));
++      if (tbartop)
++        space.setY(space.y() + tbarh);
++      space.setH(space.h() - tbarh);
++    }
++#else // !SLIT
++    Toolbar *toolbar = screen->getToolbar();
++    int tbarh = screen->hideToolbar() ? 0 :
++      toolbar->getExposedHeight() + screen->getBorderWidth() * 2;
++    switch (toolbar->placement()) {
++    case Toolbar::TopLeft:
++    case Toolbar::TopCenter:
++    case Toolbar::TopRight:
++      space.setY(toolbar->getExposedHeight());
++      space.setH(space.h() - toolbar->getExposedHeight());
++      break;
++    case Toolbar::BottomLeft:
++    case Toolbar::BottomCenter:
++    case Toolbar::BottomRight:
++      space.setH(space.h() - tbarh);
++      break;
++    default:
++      ASSERT(false);      // unhandled placement
++    }
++#endif // SLIT
++  }
 +
    openbox_attrib.premax_x = frame.x;
    openbox_attrib.premax_y = frame.y;
    openbox_attrib.premax_w = frame.width;
    openbox_attrib.premax_h = frame.height;
  
-   dw = screen->getWidth();
 -  Rect space = screen->availableArea();
+   unsigned int dw = space.w(),
+                dh = space.h();
    dw -= frame.border_w * 2;
    dw -= frame.mwm_border_w * 2;
    dw -= client.base_width;
@@@ -1741,8 -1741,9 +1819,8 @@@ void OpenboxWindow::setFocusFlag(Bool f
        XSetWindowBorder(display, frame.plate, frame.uborder_pixel);
    }
  
-   if (screen->isSloppyFocus() && screen->doAutoRaise() && timer->isTiming())
+   if (screen->sloppyFocus() && screen->autoRaise() && timer->isTiming())
      timer->stop();
 -
  }
  
  
@@@ -2280,9 -2283,12 +2358,9 @@@ void OpenboxWindow::unmapNotifyEvent(XU
              client.window);
  #endif // DEBUG
  
-     openbox->grab();
+     openbox.grab();
      if (! validateClient()) return;
  
 -    if (flags.moving)
 -      endMove();
 -    
      XChangeSaveSet(display, client.window, SetModeDelete);
      XSelectInput(display, client.window, NoEventMask);
  
@@@ -2719,21 -2726,7 +2798,21 @@@ void OpenboxWindow::buttonReleaseEvent(
    // when the window is being interactively moved, a button release stops the
    // move where it is
    if (flags.moving) {
 -    endMove();
 +    flags.moving = False;
 +
-     openbox->maskWindowEvents(0, (OpenboxWindow *) 0);
-     if (!screen->doOpaqueMove()) {
++    openbox.maskWindowEvents(0, (OpenboxWindow *) 0);
++    if (!screen->opaqueMove()) {
 +      XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 +                     frame.move_x, frame.move_y, frame.resize_w - 1,
 +                     frame.resize_h - 1);
 +
 +      configure(frame.move_x, frame.move_y, frame.width, frame.height);
-       openbox->ungrab();
++      openbox.ungrab();
 +    } else {
 +      configure(frame.x, frame.y, frame.width, frame.height);
 +    }
 +    screen->hideGeometry();
 +    XUngrabPointer(display, CurrentTime);
    // when the window is being interactively resized, a button release stops the
    // resizing
    } else if (flags.resizing) {
@@@ -2765,102 -2758,151 +2844,105 @@@
  }
  
  
 -void OpenboxWindow::startMove(int x, int y) {
 -  ASSERT(!flags.moving);
 -
 -  // make sure only one window is moving at a time
 -  OpenboxWindow *w = openbox.getMaskedWindow();
 -  if (w != (OpenboxWindow *) 0 && w->flags.moving)
 -    w->endMove();
 -  
 -  XGrabPointer(display, frame.window, False, PointerMotionMask |
 -               ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
 -               None, openbox.getMoveCursor(), CurrentTime);
 +void OpenboxWindow::motionNotifyEvent(XMotionEvent *me) {
 +  if (!flags.resizing && (me->state & Button1Mask) && functions.move &&
 +      (frame.title == me->window || frame.label == me->window ||
 +       frame.handle == me->window || frame.window == me->window)) {
 +    if (! flags.moving) {
 +      XGrabPointer(display, me->window, False, Button1MotionMask |
 +                   ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
-                    None, openbox->getMoveCursor(), CurrentTime);
++                   None, openbox.getMoveCursor(), CurrentTime);
  
 -  if (windowmenu && windowmenu->isVisible())
 -    windowmenu->hide();
 +      if (windowmenu && windowmenu->isVisible())
 +        windowmenu->hide();
  
 -  flags.moving = True;
 +      flags.moving = True;
  
-       openbox->maskWindowEvents(client.window, this);
 -  openbox.maskWindowEvents(client.window, this);
++      openbox.maskWindowEvents(client.window, this);
  
-       if (! screen->doOpaqueMove()) {
-         openbox->grab();
 -  if (! screen->opaqueMove()) {
 -    openbox.grab();
++      if (! screen->opaqueMove()) {
++        openbox.grab();
  
 -    frame.move_x = frame.x;
 -    frame.move_y = frame.y;
 -    frame.resize_w = frame.width + (frame.border_w * 2);
 -    frame.resize_h = ((flags.shaded) ? frame.title_h : frame.height) +
 -      (frame.border_w * 2);
 +        frame.move_x = frame.x;
 +	frame.move_y = frame.y;
 +        frame.resize_w = frame.width + (frame.border_w * 2);
 +        frame.resize_h = ((flags.shaded) ? frame.title_h : frame.height) +
 +          (frame.border_w * 2);
  
 -    screen->showPosition(frame.x, frame.y);
 +	screen->showPosition(frame.x, frame.y);
  
 -    XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 -                   frame.move_x, frame.move_y,
 -                   frame.resize_w - 1, frame.resize_h - 1);
 -  }
 -  frame.grab_x = x - frame.x - frame.border_w;
 -  frame.grab_y = y - frame.y - frame.border_w;
 -  cout << "START MOVE " << client.window << " " << client.title << endl;
 -}
 -
 -
 -void OpenboxWindow::doMove(int x, int y) {
 -  ASSERT(flags.moving);
 +	XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 +		       frame.move_x, frame.move_y,
 +		       frame.resize_w - 1, frame.resize_h - 1);
 +      }
 +    } else {
 +      int dx = me->x_root - frame.grab_x, dy = me->y_root - frame.grab_y;
 +
 +      dx -= frame.border_w;
 +      dy -= frame.border_w;
 +
-       int snap_distance = screen->getEdgeSnapThreshold();
++      int snap_distance = screen->edgeSnapThreshold();
++      // width/height of the snapping window
++      unsigned int snap_w = frame.width + (frame.border_w * 2);
++      unsigned int snap_h = area().h() + (frame.border_w * 2);
 +      if (snap_distance) {
-         int drx = screen->getWidth() - (dx + frame.snap_w);
++        int drx = screen->size().w() - (dx + snap_w);
 +
 +        if (dx < drx && (dx > 0 && dx < snap_distance) ||
 +                        (dx < 0 && dx > -snap_distance) )
 +          dx = 0;
 +        else if ( (drx > 0 && drx < snap_distance) ||
 +                  (drx < 0 && drx > -snap_distance) )
-           dx = screen->getWidth() - frame.snap_w;
++          dx = screen->size().w() - snap_w;
 +
 +        int dtty, dbby, dty, dby;
-         switch (screen->getToolbarPlacement()) {
++        switch (screen->getToolbar()->placement()) {
 +        case Toolbar::TopLeft:
 +        case Toolbar::TopCenter:
 +        case Toolbar::TopRight:
 +          dtty = screen->getToolbar()->getExposedHeight() +
 +	         frame.border_w;
-           dbby = screen->getHeight();
++          dbby = screen->size().h();
 +          break;
 +
 +        default:
 +          dtty = 0;
- 	  dbby = screen->getToolbar()->getY();
++	  dbby = screen->getToolbar()->area().y();
 +          break;
 +        }
  
 -  int dx = x - frame.grab_x, dy = y - frame.grab_y;
 +        dty = dy - dtty;
-         dby = dbby - (dy + frame.snap_h);
++        dby = dbby - (dy + snap_h);
  
 -  dx -= frame.border_w;
 -  dy -= frame.border_w;
 +        if ( (dy > 0 && dty < snap_distance) ||
 +            (dy < 0 && dty > -snap_distance) )
 +          dy = dtty;
 +        else if ( (dby > 0 && dby < snap_distance) ||
 +                 (dby < 0 && dby > -snap_distance) )
-           dy = dbby - frame.snap_h;
++          dy = dbby - snap_h;
 +      }
  
-       if (screen->doOpaqueMove()) {
 -  int snap_distance = screen->edgeSnapThreshold();
 -  // width/height of the snapping window
 -  unsigned int snap_w = frame.width + (frame.border_w * 2);
 -  unsigned int snap_h = area().h() + (frame.border_w * 2);
 -  if (snap_distance) {
 -    int drx = screen->size().w() - (dx + snap_w);
++      if (screen->opaqueMove()) {
 +	configure(dx, dy, frame.width, frame.height);
 +      } else {
 +	XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 +		       frame.move_x, frame.move_y, frame.resize_w - 1,
 +		       frame.resize_h - 1);
  
 -    if (dx < drx && (dx > 0 && dx < snap_distance) ||
 -        (dx < 0 && dx > -snap_distance) )
 -      dx = 0;
 -    else if ( (drx > 0 && drx < snap_distance) ||
 -             (drx < 0 && drx > -snap_distance) )
 -      dx = screen->size().w() - snap_w;
 +	frame.move_x = dx;
 +	frame.move_y = dy;
  
 -    int dtty, dbby, dty, dby;
 -    switch (screen->getToolbar()->placement()) {
 -    case Toolbar::TopLeft:
 -    case Toolbar::TopCenter:
 -    case Toolbar::TopRight:
 -      dtty = screen->getToolbar()->getExposedHeight() +
 -        frame.border_w;
 -      dbby = screen->size().h();
 -      break;
 +	XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 +		       frame.move_x, frame.move_y, frame.resize_w - 1,
 +		       frame.resize_h - 1);
 +      }
  
 -    default:
 -      dtty = 0;
 -      dbby = screen->getToolbar()->area().y();
 -      break;
 +      screen->showPosition(dx, dy);
      }
 -
 -    dty = dy - dtty;
 -    dby = dbby - (dy + snap_h);
 -
 -    if ( (dy > 0 && dty < snap_distance) ||
 -        (dy < 0 && dty > -snap_distance) )
 -      dy = dtty;
 -    else if ( (dby > 0 && dby < snap_distance) ||
 -             (dby < 0 && dby > -snap_distance) )
 -      dy = dbby - snap_h;
 -  }
 -
 -  if (screen->opaqueMove()) {
 -    configure(dx, dy, frame.width, frame.height);
 -  } else {
 -    XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 -                   frame.move_x, frame.move_y, frame.resize_w - 1,
 -                   frame.resize_h - 1);
 -
 -    frame.move_x = dx;
 -    frame.move_y = dy;
 -
 -    XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 -                   frame.move_x, frame.move_y, frame.resize_w - 1,
 -                   frame.resize_h - 1);
 -  }
 -
 -  screen->showPosition(dx, dy);
 -}
 -
 -
 -void OpenboxWindow::endMove() {
 -  ASSERT(flags.moving);
 -
 -  flags.moving = False;
 -
 -  openbox.maskWindowEvents(0, (OpenboxWindow *) 0);
 -  if (!screen->opaqueMove()) {
 -    XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
 -                   frame.move_x, frame.move_y, frame.resize_w - 1,
 -                   frame.resize_h - 1);
 -
 -    configure(frame.move_x, frame.move_y, frame.width, frame.height);
 -    openbox.ungrab();
 -  } else {
 -    configure(frame.x, frame.y, frame.width, frame.height);
 -  }
 -  screen->hideGeometry();
 -  XUngrabPointer(display, CurrentTime);
 -  // if there are any left over motions from the move, drop them now cuz they
 -  // cause problems
 -  XEvent e;
 -  while (XCheckTypedWindowEvent(display, frame.window, MotionNotify, &e));
 -  cout << "END MOVE " << client.window << " " << client.title << endl;
 -}
 -
 -
 -void OpenboxWindow::motionNotifyEvent(XMotionEvent *me) {
 -  if (flags.moving)
 -      doMove(me->x_root, me->y_root);
 -  else if (!flags.resizing && (me->state & Button1Mask) && functions.move &&
 -      (frame.title == me->window || frame.label == me->window ||
 -       frame.handle == me->window || frame.window == me->window))
 -    startMove(me->x_root, me->y_root);
 -  else if (functions.resize &&
 +  } else if (functions.resize &&
  	     (((me->state & Button1Mask) && (me->window == frame.right_grip ||
  					     me->window == frame.left_grip)) ||
 -	      (me->state == (Mod1Mask | Button3Mask) &&
 +	      (me->state & (Mod1Mask | Button3Mask) &&
  	                                     me->window == frame.window))) {
      Bool left = resize_zone & ZoneLeft;
  
diff --cc src/Window.h
index d6e9f809,fb988e23..b916ca67
--- a/src/Window.h
+++ b/src/Window.h
@@@ -238,71 -240,97 +239,96 @@@ protected
  
  
  public:
-   OpenboxWindow(Openbox *b, Window w, BScreen *s = (BScreen *) 0);
+   OpenboxWindow(Openbox &b, Window w, BScreen *s = (BScreen *) 0);
 -  virtual ~OpenboxWindow();
 -
 -  inline Bool isTransient() const { return flags.transient; }
 -  inline Bool isFocused() const { return flags.focused; }
 -  inline Bool isVisible() const { return flags.visible; }
 -  inline Bool isIconic() const { return flags.iconic; }
 -  inline Bool isShaded() const { return flags.shaded; }
 -  inline Bool isMaximized() const { return flags.maximized; }
 -  inline Bool isMaximizedFull() const { return flags.maximized == 1; }
 -  inline Bool isStuck() const { return flags.stuck; }
 -  inline Bool isIconifiable() const { return functions.iconify; }
 -  inline Bool isMaximizable() const { return functions.maximize; }
 -  inline Bool isResizable() const { return functions.resize; }
 -  inline Bool isClosable() const { return functions.close; }
 -
 -  inline Bool hasTitlebar() const { return decorations.titlebar; }
 -  inline Bool hasTransient() const
 +  virtual ~OpenboxWindow(void);
 +
 +  inline Bool isTransient(void) const { return flags.transient; }
 +  inline Bool isFocused(void) const { return flags.focused; }
 +  inline Bool isVisible(void) const { return flags.visible; }
 +  inline Bool isIconic(void) const { return flags.iconic; }
 +  inline Bool isShaded(void) const { return flags.shaded; }
 +  inline Bool isMaximized(void) const { return flags.maximized; }
 +  inline Bool isMaximizedFull(void) const { return flags.maximized == 1; }
 +  inline Bool isStuck(void) const { return flags.stuck; }
 +  inline Bool isIconifiable(void) const { return functions.iconify; }
 +  inline Bool isMaximizable(void) const { return functions.maximize; }
 +  inline Bool isResizable(void) const { return functions.resize; }
 +  inline Bool isClosable(void) const { return functions.close; }
 +
 +  inline Bool hasTitlebar(void) const { return decorations.titlebar; }
 +  inline Bool hasTransient(void) const
    { return ((client.transient) ? True : False); }
  
 -  inline OpenboxWindow *getTransient() { return client.transient; }
 -  inline OpenboxWindow *getTransientFor() { return client.transient_for; }
 +  inline OpenboxWindow *getTransient(void) { return client.transient; }
 +  inline OpenboxWindow *getTransientFor(void) { return client.transient_for; }
  
 -  inline BScreen *getScreen() { return screen; }
 +  inline BScreen *getScreen(void) { return screen; }
  
 -  inline const Window &getFrameWindow() const { return frame.window; }
 -  inline const Window &getClientWindow() const { return client.window; }
 +  inline const Window &getFrameWindow(void) const { return frame.window; }
 +  inline const Window &getClientWindow(void) const { return client.window; }
  
 -  inline Windowmenu * getWindowmenu() { return windowmenu; }
 +  inline Windowmenu * getWindowmenu(void) { return windowmenu; }
  
 -  inline char **getTitle() { return &client.title; }
 -  inline char **getIconTitle() { return &client.icon_title; }
 -  //inline const int &getXFrame() const { return frame.x; }
 -  //inline const int &getYFrame() const { return frame.y; }
 -  //inline const int &getXClient() const { return client.x; }
 -  //inline const int &getYClient() const { return client.y; }
 -  inline const int &getWorkspaceNumber() const { return workspace_number; }
 -  inline const int &getWindowNumber() const { return window_number; }
 +  inline char **getTitle(void) { return &client.title; }
 +  inline char **getIconTitle(void) { return &client.icon_title; }
-   inline const int &getXFrame(void) const { return frame.x; }
-   inline const int &getYFrame(void) const { return frame.y; }
-   inline const int &getXClient(void) const { return client.x; }
-   inline const int &getYClient(void) const { return client.y; }
++  //inline const int &getXFrame(void) const { return frame.x; }
++  //inline const int &getYFrame(void) const { return frame.y; }
++  //inline const int &getXClient(void) const { return client.x; }
++  //inline const int &getYClient(void) const { return client.y; }
 +  inline const int &getWorkspaceNumber(void) const { return workspace_number; }
 +  inline const int &getWindowNumber(void) const { return window_number; }
  
-   inline const unsigned int &getWidth(void) const { return frame.width; }
-   inline const unsigned int &getHeight(void) const { return frame.height; }
-   inline const unsigned int &getClientHeight(void) const
-   { return client.height; }
-   inline const unsigned int &getClientWidth(void) const
-   { return client.width; }
 -  //inline const unsigned int &getWidth() const { return frame.width; }
 -  //inline const unsigned int &getHeight() const {
++  //inline const unsigned int &getWidth(void) const { return frame.width; }
++  //inline const unsigned int &getHeight(void) const {
+   //  if (!flags.shaded)
+   //    return frame.height;
+   //  else
+   //    return frame.title_h;
+   //}
 -  //inline const unsigned int &getClientHeight() const
++  //inline const unsigned int &getClientHeight(void) const
+   //{ return client.height; }
 -  //inline const unsigned int &getClientWidth() const
++  //inline const unsigned int &getClientWidth(void) const
+   //{ return client.width; }
 -  inline const unsigned int &getTitleHeight() const
 +  inline const unsigned int &getTitleHeight(void) const
    { return frame.title_h; }
  
+   //inline const Point origin() const {
+   //  return Point(frame.x, frame.y);
+   //}
+   //inline const Point clientOrigin() const {
+   //  return Point(client.x, client.y);
+   //}
+   //inline const Size size() const {
+   //  return Size(frame.width, flags.shaded ? frame.title_h : frame.height);
+   //}
+   //inline const Size clientSize() const {
+   //  return Size(client.width, client.height);
+   //}
+   inline const Rect area() const {
+     return Rect(frame.x, frame.y, frame.width,
+                 flags.shaded ? frame.title_h : frame.height);
+   }
+   inline const Rect clientArea() const {
+     return Rect(client.x, client.y, client.width, client.height);
+   }
+   
    inline void setWindowNumber(int n) { window_number = n; }
    
 -  Bool validateClient();
 -  Bool setInputFocus();
 +  Bool validateClient(void);
 +  Bool setInputFocus(void);
  
    void setFocusFlag(Bool);
 -  void iconify();
 -  void deiconify(bool reassoc = true, bool raise = true, bool initial = false);
 -  void close();
 -  void withdraw();
 +  void iconify(void);
 +  void deiconify(Bool reassoc = True, Bool raise = True);
 +  void close(void);
 +  void withdraw(void);
    void maximize(unsigned int button);
 -  void shade();
 -  void stick();
 -  void unstick();
 -  void reconfigure();
 +  void shade(void);
 +  void stick(void);
 +  void unstick(void);
 +  void reconfigure(void);
    void installColormap(Bool);
 -  void restore();
 +  void restore(void);
    void configure(int dx, int dy, unsigned int dw, unsigned int dh);
    void setWorkspace(int n);
    void changeOpenboxHints(OpenboxHints *);
diff --cc src/Workspace.cc
index fa1f7990,a9fbcdb9..d52f73de
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@@ -46,15 -50,21 +50,21 @@@
  #  include <stdio.h>
  #endif // HAVE_STDIO_H
  
- #ifdef    STDC_HEADERS
+ #ifdef    HAVE_STDLIB_H
+ #  include <stdlib.h>
+ #endif // HAVE_STDLIB_H
+ 
+ #ifdef    HAVE_STRING_H
  #  include <string.h>
- #endif // STDC_HEADERS
+ #endif // HAVE_STRING_H
  
 -#include <vector>
+ #include <algorithm>
 -typedef vector<Rect> rectList;
++#include <vector>
++typedef std::vector<Rect> rectList;
  
- Workspace::Workspace(BScreen *scrn, int i) {
-   screen = scrn;
+ Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
  
 -  cascade_x = cascade_y = 0;
 +  cascade_x = cascade_y = 32;
  
    id = i;
  
@@@ -322,181 -333,290 +333,379 @@@ void Workspace::shutdown(void) 
    }
  }
  
- void Workspace::placeWindow(OpenboxWindow *win) {
-   Bool placed = False;
+ static rectList calcSpace(const Rect &win, const rectList &spaces) {
+   rectList result;
+   rectList::const_iterator siter;
+   for(siter=spaces.begin(); siter!=spaces.end(); ++siter) {
+     if(win.Intersect(*siter)) {
+       //Check for space to the left of the window
+       if(win.x() > siter->x())
+         result.push_back(Rect(siter->x(), siter->y(),
+                               win.x() - siter->x() - 1,
+                               siter->h()));
+       //Check for space above the window
+       if(win.y() > siter->y())
+         result.push_back(Rect(siter->x(), siter->y(),
+                               siter->w(),
+                               win.y() - siter->y() - 1));
+       //Check for space to the right of the window
+       if((win.x()+win.w()) <
+          (siter->x()+siter->w()))
+         result.push_back(Rect(win.x() + win.w() + 1,
+                               siter->y(),
+                               siter->x() + siter->w() -
+                               win.x() - win.w() - 1,
+                               siter->h()));
+       //Check for space below the window
+       if((win.y()+win.h()) <
+          (siter->y()+siter->h()))
+         result.push_back(Rect(siter->x(),
+                               win.y() + win.h() + 1,
+                               siter->w(),
+                               siter->y() + siter->h()-
+                               win.y() - win.h() - 1));
  
-   const int win_w = win->getWidth() + (screen->getBorderWidth() * 4),
-     win_h = win->getHeight() + (screen->getBorderWidth() * 4),
- #ifdef    SLIT
-     slit_x = screen->getSlit()->getX() - screen->getBorderWidth(),
-     slit_y = screen->getSlit()->getY() - screen->getBorderWidth(),
-     slit_w = screen->getSlit()->getWidth() +
-       (screen->getBorderWidth() * 4),
-     slit_h = screen->getSlit()->getHeight() +
-       (screen->getBorderWidth() * 4),
- #endif // SLIT
-     toolbar_x = screen->getToolbar()->getX() - screen->getBorderWidth(),
-     toolbar_y = screen->getToolbar()->getY() - screen->getBorderWidth(),
-     toolbar_w = screen->getToolbar()->getWidth() +
-       (screen->getBorderWidth() * 4),
-     toolbar_h = screen->getToolbar()->getHeight() + 
-       (screen->getBorderWidth() * 4),
-     start_pos = 0,
-     change_y =
-       ((screen->getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1),
-     change_x =
-       ((screen->getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1),
-     delta_x = 8, delta_y = 8;
+     }
+     else
+       result.push_back(*siter);
+   }
+   return result;
+ }
+ 
 -bool rowRLBT(const Rect &first, const Rect &second){
 -  if (first.y()+first.h()==second.y()+second.h())
 -     return first.x()+first.w()>second.x()+second.w();
 -  return first.y()+first.h()>second.y()+second.h();
 -}
 - 
 -bool rowRLTB(const Rect &first, const Rect &second){
 -  if (first.y()==second.y())
 -     return first.x()+first.w()>second.x()+second.w();
 -  return first.y()<second.y();
 -}
+ 
 -bool rowLRBT(const Rect &first, const Rect &second){
 -  if (first.y()+first.h()==second.y()+second.h())
 -     return first.x()<second.x();
 -  return first.y()+first.h()>second.y()+second.h();
 -}
 - 
 -bool rowLRTB(const Rect &first, const Rect &second){
 -  if (first.y()==second.y())
 -     return first.x()<second.x();
 -  return first.y()<second.y();
 -}
 - 
 -bool colLRTB(const Rect &first, const Rect &second){
 -  if (first.x()==second.x())
 -     return first.y()<second.y();
 -  return first.x()<second.x();
++bool incWidth(const Rect &first, const Rect &second) {
++  return first.x() < second.x();
+ }
 - 
 -bool colLRBT(const Rect &first, const Rect &second){
 -  if (first.x()==second.x())
 -     return first.y()+first.h()>second.y()+second.h();
 -  return first.x()<second.x();
 +
++
++bool decWidth(const Rect &first, const Rect &second) {
++  if (second.x() == first.x())
++     return second.w() < first.w();
++  return second.x() < first.x();
+ }
+ 
 -bool colRLTB(const Rect &first, const Rect &second){
 -  if (first.x()+first.w()==second.x()+second.w())
 -     return first.y()<second.y();
 -  return first.x()+first.w()>second.x()+second.w();
++
++bool incHeight(const Rect &first, const Rect &second) {
++  return first.y() < second.y();
+ }
 - 
 -bool colRLBT(const Rect &first, const Rect &second){
 -  if (first.x()+first.w()==second.x()+second.w())
 -     return first.y()+first.h()>second.y()+second.h();
 -  return first.x()+first.w()>second.x()+second.w();
++
++
++bool decHeight(const Rect &first, const Rect &second) {
++  if (second.y() == first.y())
++     return second.h() < first.h();
++  return second.y() < first.y();
+ }
+ 
+ 
+ //BestFitPlacement finds the smallest free space that fits the window
+ //to be placed. It currentl ignores whether placement is right to left or top
+ //to bottom.
+ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
+   const Rect *best;
+   rectList spaces;
+   LinkedListIterator<OpenboxWindow> it(windowList);
+   rectList::const_iterator siter;
+   spaces.push_back(space); //initially the entire screen is free
+   it.reset();
+   
+   //Find Free Spaces
+   for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
+      spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
+                         spaces);
+   
++  //Sort the spaces by placement choice
++  if (screen.rowPlacementDirection() == BScreen::TopBottom)
++     sort(spaces.begin(), spaces.end(), decHeight);
++  else
++     sort(spaces.begin(), spaces.end(), incHeight);
++  if (screen.colPlacementDirection() == BScreen::TopBottom)
++     stable_sort(spaces.begin(), spaces.end(), incHeight);
++  else
++     stable_sort(spaces.begin(), spaces.end(), decHeight);
++
+   //Find first space that fits the window
+   best = NULL;
+   for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
+     if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
+       if (best==NULL)
 -        best = siter;
++        best = &*siter;
+       else if(siter->w()*siter->h()<best->h()*best->w())
 -        best = siter;
++        best = &*siter;
+     }
+   }
+   if (best != NULL) {
+     Point *pt = new Point(best->origin());
+     if (screen.colPlacementDirection() != BScreen::TopBottom)
+       pt->setY(pt->y() + (best->h() - win_size.h()));
+     if (screen.rowPlacementDirection() != BScreen::LeftRight)
+       pt->setX(pt->x() + (best->w() - win_size.w()));
+     return pt;
+   } else
+     return NULL; //fall back to cascade
+ }
+ 
 -Point *Workspace::underMousePlacement(const Size &win_size, const Rect &space) {
 -  Point *pt;
 -
 -  int x, y, rx, ry;
 -  Window c, r;
 -  unsigned int m;
 -  XQueryPointer(screen.getOpenbox().getXDisplay(), screen.getRootWindow(),
 -                &r, &c, &rx, &ry, &x, &y, &m);
 -  pt = new Point(rx - win_size.w() / 2, ry - win_size.h() / 2);
 -
 -  if (pt->x() < space.x())
 -    pt->setX(space.x());
 -  if (pt->y() < space.y())
 -    pt->setY(space.y());
 -  if (pt->x() + win_size.w() > space.x() + space.w())
 -    pt->setX(space.x() + space.w() - win_size.w());
 -  if (pt->y() + win_size.h() > space.y() + space.h())
 -    pt->setY(space.y() + space.h() - win_size.h());
 -  return pt;
 -}
+ 
+ Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
 -  const Rect *best;
 -  rectList spaces;
++  bool placed=false;
 +  int test_x, test_y, place_x = 0, place_y = 0;
++  int start_pos = 0;
++  int change_y =
++     ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1);
++  int change_x =
++     ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1);
++  int delta_x = 8, delta_y = 8;
    LinkedListIterator<OpenboxWindow> it(windowList);
  
-   switch (screen->getPlacementPolicy()) {
-   case BScreen::RowSmartPlacement: {
-     test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
-       start_pos : screen->getHeight() - win_h - start_pos;
 -  rectList::const_iterator siter;
 -  spaces.push_back(space); //initially the entire screen is free
 -  it.reset();
 -  
 -  //Find Free Spaces
 -  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
 -     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
 -                        spaces);
 -  //Sort spaces by preference
 -  if(screen.rowPlacementDirection() == BScreen::RightLeft)
 -     if(screen.colPlacementDirection() == BScreen::TopBottom)
 -        sort(spaces.begin(),spaces.end(),rowRLTB);
 -     else
 -        sort(spaces.begin(),spaces.end(),rowRLBT);
 -  else
 -     if(screen.colPlacementDirection() == BScreen::TopBottom)
 -        sort(spaces.begin(),spaces.end(),rowLRTB);
 -     else
 -        sort(spaces.begin(),spaces.end(),rowLRBT);
 -  best = NULL;
 -  for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
 -    if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
 -      best = siter;
 -      break;
++  test_y = (screen.colPlacementDirection() == BScreen::TopBottom) ?
++    start_pos : screen.size().h() - win_size.h() - start_pos;
 +
++  while(!placed &&
++        ((screen.colPlacementDirection() == BScreen::BottomTop) ?
++         test_y > 0 : test_y + win_size.h() < (signed) space.h())) {
++    test_x = (screen.rowPlacementDirection() == BScreen::LeftRight) ?
++      start_pos : space.w() - win_size.w() - start_pos;
 +    while (!placed &&
- 	   ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
- 	    test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
-       test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
- 	start_pos : screen->getWidth() - win_w - start_pos;
- 
-       while (!placed &&
- 	     ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
- 	      test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
-         placed = True;
- 
-         it.reset();
-         for (OpenboxWindow *curr = it.current(); placed && curr;
- 	     it++, curr = it.current()) {
-           if (curr->isMaximizedFull()) // fully maximized, ignore it
-             continue;
-           int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
-           int curr_h =
- 	    ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
-             (screen->getBorderWidth() * 4);
- 	  
-           if (curr->getXFrame() < test_x + win_w &&
-               curr->getXFrame() + curr_w > test_x &&
-               curr->getYFrame() < test_y + win_h &&
-               curr->getYFrame() + curr_h > test_y) {
-             placed = False;
- 	  }
++           ((screen.rowPlacementDirection() == BScreen::RightLeft) ?
++            test_x > 0 : test_x + win_size.w() < (signed) space.w())) {
++      placed = true;
++
++      it.reset();
++      for (OpenboxWindow *curr = it.current(); placed && curr;
++           it++, curr = it.current()) {
++        int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
++        int curr_h = curr->area().h() + (screen.getBorderWidth() * 4);
++
++        if (curr->area().x() < test_x + win_size.w() &&
++            curr->area().x() + curr_w > test_x &&
++            curr->area().y() < test_y + win_size.h() &&
++            curr->area().y() + curr_h > test_y) {
++          placed = false;
 +        }
++      }
 +
-         if (placed &&
- 	    (toolbar_x < test_x + win_w &&
-              toolbar_x + toolbar_w > test_x &&
-              toolbar_y < test_y + win_h &&
-              toolbar_y + toolbar_h > test_y)
- #ifdef    SLIT
-              ||
-             (slit_x < test_x + win_w &&
-              slit_x + slit_w > test_x &&
-              slit_y < test_y + win_h &&
-              slit_y + slit_h > test_y)
- #endif // SLIT
- 	    )
-           placed = False;
++      // Removed code for checking toolbar and slit
++      // The space passed in should not include either
++
++      if (placed) {
++        place_x = test_x;
++        place_y = test_y;
++
++        break;
++      }   
++
++      test_x += (change_x * delta_x);
+     }
  
-         if (placed) {
-           place_x = test_x;
-           place_y = test_y;
 -  if (best != NULL) {
 -    Point *pt = new Point(best->origin());
 -    if (screen.colPlacementDirection() != BScreen::TopBottom)
 -      pt->setY(best->y() + best->h() - win_size.h());
 -    if (screen.rowPlacementDirection() != BScreen::LeftRight)
 -      pt->setX(best->x()+best->w()-win_size.w());
 -    return pt;
 -  } else
 -    return NULL; //fall back to cascade
++    test_y += (change_y * delta_y);
++  }
++  if (placed)
++    return new Point(place_x, place_y);
++  else
++    return NULL; // fall back to cascade
+ }
  
-           break;
+ Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
 -  const Rect *best;
 -  rectList spaces;
++  Point *pt;
++  bool placed=false;
++  int test_x, test_y;
++  int start_pos = 0;
++  int change_y =
++    ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1);
++  int change_x =
++    ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1);
++  int delta_x = 8, delta_y = 8;
+   LinkedListIterator<OpenboxWindow> it(windowList);
+ 
 -  rectList::const_iterator siter;
 -  spaces.push_back(space); //initially the entire screen is free
 -  it.reset();
 -  
 -  //Find Free Spaces
 -  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
 -     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
 -                        spaces);
 -  //Sort spaces by user preference
 -  if(screen.colPlacementDirection() == BScreen::TopBottom)
 -     if(screen.rowPlacementDirection() == BScreen::LeftRight)
 -        sort(spaces.begin(),spaces.end(),colLRTB);
 -     else
 -        sort(spaces.begin(),spaces.end(),colRLTB);
 -  else
 -     if(screen.rowPlacementDirection() == BScreen::LeftRight)
 -        sort(spaces.begin(),spaces.end(),colLRBT);
 -     else
 -        sort(spaces.begin(),spaces.end(),colRLBT);
++  test_x = (screen.rowPlacementDirection() == BScreen::LeftRight) ?
++    start_pos : screen.size().w() - win_size.w() - start_pos;
++
++  while(!placed &&
++        ((screen.rowPlacementDirection() == BScreen::RightLeft) ?
++         test_x > 0 : test_x + win_size.w() < (signed) space.w())) {
++    test_y = (screen.colPlacementDirection() == BScreen::TopBottom) ?
++      start_pos : screen.size().h() - win_size.h() - start_pos;
++
++    while(!placed &&
++          ((screen.colPlacementDirection() == BScreen::BottomTop) ?
++           test_y > 0 : test_y + win_size.h() < (signed) space.h())){
++
++      placed = true;
++
++      it.reset();
++      for (OpenboxWindow *curr = it.current(); placed && curr;
++           it++, curr = it.current()) {
++        int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
++        int curr_h = curr->area().h() + (screen.getBorderWidth() * 4);
++
++        if (curr->area().x() < test_x + win_size.w() &&
++            curr->area().x() + curr_w > test_x &&
++            curr->area().y() < test_y + win_size.h() &&
++            curr->area().y() + curr_h > test_y) {
++          placed = False;
 +        }
++      }
+ 
 -  //Find first space that fits the window
 -  best = NULL;
 -  for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
 -    if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
 -      best = siter;
 -      break;
++      // Removed code checking for intersection with Toolbar and Slit
++      // The space passed to this method should not include either
++
++      if (placed) {
++        pt= new Point(test_x,test_y);
 +
- 	test_x += (change_x * delta_x);
++        break;
 +      }
 +
 +      test_y += (change_y * delta_y);
      }
  
-     break;
 -  if (best != NULL) {
 -    Point *pt = new Point(best->origin());
 -    if (screen.colPlacementDirection() != BScreen::TopBottom)
 -      pt->setY(pt->y() + (best->h() - win_size.h()));
 -    if (screen.rowPlacementDirection() != BScreen::LeftRight)
 -      pt->setX(pt->x() + (best->w() - win_size.w()));
++    test_x += (change_x * delta_x);
 +  }
++  if (placed)
+     return pt;
 -  } else
 -    return NULL; //fall back to cascade
++  else
++    return NULL;
+ }
  
-   case BScreen::ColSmartPlacement: {
-     test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
-       start_pos : screen->getWidth() - win_w - start_pos;
  
-     while (!placed &&
- 	   ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
- 	    test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
-       test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
- 	start_pos : screen->getHeight() - win_h - start_pos;
-       
-       while (!placed &&
- 	     ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
- 	      test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
-         placed = True;
- 
-         it.reset();
-         for (OpenboxWindow *curr = it.current(); placed && curr;
- 	     it++, curr = it.current()) {
-           if (curr->isMaximizedFull()) // fully maximized, ignore it
-             continue;
-           int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
-           int curr_h =
-             ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
-             (screen->getBorderWidth() * 4);
- 
-           if (curr->getXFrame() < test_x + win_w &&
-               curr->getXFrame() + curr_w > test_x &&
-               curr->getYFrame() < test_y + win_h &&
-               curr->getYFrame() + curr_h > test_y) {
-             placed = False;
- 	  }
-         }
 -Point *const Workspace::cascadePlacement(const OpenboxWindow &win,
 -                                         const Rect &space) {
 -  if ((cascade_x + win.area().w() + screen.getBorderWidth() * 2 >
 -       (space.x() + space.w())) ||
 -      (cascade_y + win.area().h() + screen.getBorderWidth() * 2 >
 -       (space.y() + space.h())))
 -    cascade_x = cascade_y = 0;
 -  if (cascade_x < space.x() || cascade_y < space.y()) {
 -    cascade_x = space.x();
 -    cascade_y = space.y();
 -  }
++Point *const Workspace::cascadePlacement(const OpenboxWindow *const win){
++  if (((unsigned) cascade_x > (screen.size().w() / 2)) ||
++      ((unsigned) cascade_y > (screen.size().h() / 2)))
++    cascade_x = cascade_y = 32;
 +
-         if (placed &&
- 	    (toolbar_x < test_x + win_w &&
- 	     toolbar_x + toolbar_w > test_x &&
- 	     toolbar_y < test_y + win_h &&
- 	     toolbar_y + toolbar_h > test_y)
- #ifdef    SLIT
- 	    ||
- 	    (slit_x < test_x + win_w &&
- 	     slit_x + slit_w > test_x &&
- 	     slit_y < test_y + win_h &&
- 	     slit_y + slit_h > test_y)
- #endif // SLIT
- 	    )
- 	  placed = False;
++  cascade_x += win->getTitleHeight();
++  cascade_y += win->getTitleHeight();
  
- 	if (placed) {
- 	  place_x = test_x;
- 	  place_y = test_y;
 -  Point *p = new Point(cascade_x, cascade_y);
 -  cascade_x += win.getTitleHeight();
 -  cascade_y += win.getTitleHeight();
 -  return p;
++  return new Point(cascade_x, cascade_y);
+ }
  
- 	  break;
- 	}
  
- 	test_y += (change_y * delta_y);
-       }
 -void Workspace::placeWindow(OpenboxWindow &win) {
 -  Rect space = screen.availableArea();
 -  const Size window_size(win.area().w()+screen.getBorderWidth() * 2,
 -                         win.area().h()+screen.getBorderWidth() * 2);
++void Workspace::placeWindow(OpenboxWindow *win) {
++  ASSERT(win != NULL);
 +
-       test_x += (change_x * delta_x);
-     }
++  // the following code is temporary and will be taken care of by Screen in the
++  // future (with the NETWM 'strut')
++  Rect space(0, 0, screen.size().w(), screen.size().h());
 +
++#ifdef    SLIT
++    Slit *slit = screen.getSlit();
++    int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
++        slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
++    Toolbar *toolbar = screen.getToolbar();
++    int tbarh = screen.hideToolbar() ? 0 :
++      toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
++    bool tbartop;
++    switch (toolbar->placement()) {
++    case Toolbar::TopLeft:
++    case Toolbar::TopCenter:
++    case Toolbar::TopRight:
++      tbartop = true;
++      break;
++    case Toolbar::BottomLeft:
++    case Toolbar::BottomCenter:
++    case Toolbar::BottomRight:
++      tbartop = false;
++      break;
++    default:
++      ASSERT(false);      // unhandled placement
++    }
++    if ((slit->direction() == Slit::Horizontal &&
++         (slit->placement() == Slit::TopLeft ||
++          slit->placement() == Slit::TopRight)) ||
++        slit->placement() == Slit::TopCenter) {
++      // exclude top
++      if (tbartop && slit_y + slit->area().h() < tbarh) {
++        space.setY(space.y() + tbarh);
++        space.setH(space.h() - tbarh);
++      } else {
++        space.setY(space.y() + (slit_y + slit->area().h() +
++                                screen.getBorderWidth() * 2));
++        space.setH(space.h() - (slit_y + slit->area().h() +
++                                screen.getBorderWidth() * 2));
++        if (!tbartop)
++          space.setH(space.h() - tbarh);
++      }
++    } else if ((slit->direction() == Slit::Vertical &&
++              (slit->placement() == Slit::TopRight ||
++               slit->placement() == Slit::BottomRight)) ||
++             slit->placement() == Slit::CenterRight) {
++      // exclude right
++      space.setW(space.w() - (screen.size().w() - slit_x));
++      if (tbartop)
++        space.setY(space.y() + tbarh);
++      space.setH(space.h() - tbarh);
++    } else if ((slit->direction() == Slit::Horizontal &&
++              (slit->placement() == Slit::BottomLeft ||
++               slit->placement() == Slit::BottomRight)) ||
++             slit->placement() == Slit::BottomCenter) {
++      // exclude bottom
++      if (!tbartop && (screen.size().h() - slit_y) < tbarh) {
++        space.setH(space.h() - tbarh);
++      } else {
++        space.setH(space.h() - (screen.size().h() - slit_y));
++        if (tbartop) {
++          space.setY(space.y() + tbarh);
++          space.setH(space.h() - tbarh);
++        }
++      }
++    } else {// if ((slit->direction() == Slit::Vertical &&
++      //      (slit->placement() == Slit::TopLeft ||
++      //       slit->placement() == Slit::BottomLeft)) ||
++      //     slit->placement() == Slit::CenterLeft)
++      // exclude left
++      space.setX(slit_x + slit->area().w() +
++                 screen.getBorderWidth() * 2);
++      space.setW(space.w() - (slit_x + slit->area().w() +
++                              screen.getBorderWidth() * 2));
++      if (tbartop)
++        space.setY(space.y() + tbarh);
++      space.setH(space.h() - tbarh);
++    }
++#else // !SLIT
++  Toolbar *toolbar = screen.getToolbar();
++  int tbarh = screen.hideToolbar() ? 0 :
++    toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
++  switch (toolbar->placement()) {
++  case Toolbar::TopLeft:
++  case Toolbar::TopCenter:
++  case Toolbar::TopRight:
++    space.setY(toolbar->getExposedHeight());
++    space.setH(space.h() - toolbar->getExposedHeight());
++    break;
++  case Toolbar::BottomLeft:
++  case Toolbar::BottomCenter:
++  case Toolbar::BottomRight:
++    space.setH(space.h() - tbarh);
 +    break;
++  default:
++    ASSERT(false);      // unhandled placement
 +  }
-   } // switch
- 
-   if (! placed) {
-     if (((unsigned) cascade_x > (screen->getWidth() / 2)) ||
- 	((unsigned) cascade_y > (screen->getHeight() / 2)))
-       cascade_x = cascade_y = 32;
++#endif // SLIT
 +
-     place_x = cascade_x;
-     place_y = cascade_y;
++  const Size window_size(win->area().w()+screen.getBorderWidth() * 4,
++                         win->area().h()+screen.getBorderWidth() * 4);
+   Point *place = NULL;
+   LinkedListIterator<OpenboxWindow> it(windowList);
  
-     cascade_x += win->getTitleHeight();
-     cascade_y += win->getTitleHeight();
-   }
-   
-   if (place_x + win_w > (signed) screen->getWidth())
-     place_x = (((signed) screen->getWidth()) - win_w) / 2;
-   if (place_y + win_h > (signed) screen->getHeight())
-     place_y = (((signed) screen->getHeight()) - win_h) / 2;
+   switch (screen.placementPolicy()) {
+   case BScreen::BestFitPlacement:
+     place = bestFitPlacement(window_size, space);
+     break;
+   case BScreen::RowSmartPlacement:
+     place = rowSmartPlacement(window_size, space);
+     break;
+   case BScreen::ColSmartPlacement:
+     place = colSmartPlacement(window_size, space);
+     break;
 -  case BScreen::UnderMousePlacement:
 -  case BScreen::ClickMousePlacement:
 -    place = underMousePlacement(window_size, space);
 -    break;
+   } // switch
  
-   win->configure(place_x, place_y, win->getWidth(), win->getHeight());
+   if (place == NULL)
 -    place = cascadePlacement(win, space);
++    place = cascadePlacement(win);
+  
+   ASSERT(place != NULL);  
 -  if (place->x() + window_size.w() > (signed) space.x() + space.w())
 -    place->setX(((signed) space.x() + space.w() - window_size.w()) / 2);
 -  if (place->y() + window_size.h() > (signed) space.y() + space.h())
 -    place->setY(((signed) space.y() + space.h() - window_size.h()) / 2);
++  if (place->x() + window_size.w() > (signed) screen.size().w())
++    place->setX(((signed) screen.size().w() - window_size.w()) / 2);
++  if (place->y() + window_size.h() > (signed) screen.size().h())
++    place->setY(((signed) screen.size().h() - window_size.h()) / 2);
+ 
 -  win.configure(place->x(), place->y(), win.area().w(), win.area().h());
++  win->configure(place->x(), place->y(), win->area().w(), win->area().h());
+   delete place;
  }
diff --cc src/Workspace.h
index f9700bdc,ab8dad3f..c2b92091
--- a/src/Workspace.h
+++ b/src/Workspace.h
@@@ -45,14 -46,18 +46,17 @@@ private
  
  
  protected:
 -  void placeWindow(OpenboxWindow &);
 +  void placeWindow(OpenboxWindow *);
- 
+   Point *bestFitPlacement(const Size &win_size, const Rect &space);
 -  Point *underMousePlacement(const Size &win_size, const Rect &space);
+   Point *rowSmartPlacement(const Size &win_size, const Rect &space);
+   Point *colSmartPlacement(const Size &win_size, const Rect &space);
 -  Point *const cascadePlacement(const OpenboxWindow &window, const Rect &space);
++  Point *const cascadePlacement(const OpenboxWindow* window);
  
  public:
-   Workspace(BScreen *, int = 0);
+   Workspace(BScreen &, int = 0);
    ~Workspace(void);
  
-   inline BScreen *getScreen(void) { return screen; }
+   inline BScreen &getScreen(void) { return screen; }
  
    inline OpenboxWindow *getLastFocusedWindow(void) { return lastfocus; }
    
diff --cc src/openbox.h
index 6f23e035,8135a329..eae8bcff
--- a/src/openbox.h
+++ b/src/openbox.h
@@@ -150,25 -153,27 +153,25 @@@ public
  
    Toolbar *searchToolbar(Window);
  
-   inline const char *getStyleFilename(void) const
+   inline const char *getStyleFilename() const
      { return resource.style_file; }
-   inline const char *getMenuFilename(void) const
+   inline const char *getMenuFilename() const
      { return resource.menu_file; }
  
-   inline const int &getColorsPerChannel(void) const
+   inline const int &getColorsPerChannel() const
      { return resource.colors_per_channel; }
  
-   inline const timeval &getAutoRaiseDelay(void) const
+   inline const timeval &getAutoRaiseDelay() const
      { return resource.auto_raise_delay; }
  
-   inline const char *getTitleBarLayout(void) const
+   inline const char *getTitleBarLayout() const
      { return resource.titlebar_layout; }
  
-   inline const unsigned long &getCacheLife(void) const
+   inline const unsigned long &getCacheLife() const
      { return resource.cache_life; }
-   inline const unsigned long &getCacheMax(void) const
+   inline const unsigned long &getCacheMax() const
      { return resource.cache_max; }
  
 -  inline OpenboxWindow *getMaskedWindow() const
 -    { return masked_window; }
    inline void maskWindowEvents(Window w, OpenboxWindow *bw)
      { masked = w; masked_window = bw; }
    inline void setNoFocus(Bool f) { no_focus = f; }
diff --cc util/Makefile.in
index aefa5e99,3f3f38dc..a9625a18
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@@ -1,6 -1,6 +1,6 @@@
--# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc util/bsetbg
index a0675aa6,23b0718d..59d6b093
--- a/util/bsetbg
+++ b/util/bsetbg
@@@ -20,206 -20,62 +20,62 @@@
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  # DEALINGS IN THE SOFTWARE.
  
- 
- error_msg()
- {
-  case $INFO in yes|y|1) info_msg; esac
- 
-  case $1 in
-    1)
-      echo; echo "$NAME: configuration error: $OPTION=\"$VALUE\"" 
-      echo "$NAME: please edit $CONFIG and provide the correct variable."
-      ;;
-    2)
-      echo; echo "$NAME: error: couldn't execute '$APP'! tried to run fallback option $ARGUMENT"
-      echo "$NAME: but quit because of the following error in $CONFIG:"
-      echo "$NAME: $OPTION= $VALUE"
-      echo "$NAME: please edit $CONFIG and provide the correct variable!"
-      ;;
-    3)
-      echo; echo "$NAME: error: couldn't find any suitable image applications in the system path!"
-      echo
-      error_msg url
-      ;;
-    4)
-      echo; echo "$NAME: error: invalid option, or non-existent image ($ARGUMENT)."
-      ;;
-    5)
-      echo; echo "$NAME: error: the image you specified ($IMAGE) could not be found."
-      ;;
-    6)
-      echo; echo "$NAME: error: please specify a valid image."
-      ;;
-    7)
-      echo; echo "$NAME: error: bsetroot couldn't be found! check your openbox installation."
-      ;;
-    8)
-      echo; echo "$NAME: error: wrong number of arguments!"
-      echo "$NAME: make sure you enclosed the options for '$APP' in double quotes."
-      ;;
-    nobgapp)
-      echo; echo "$NAME: error: tried to run '$VALUE' for $ARGUMENT argument,"
-      echo "$NAME: but couldnt find '$APP' in the path! please fix the following"
-      echo "$NAME: line in $CONFIG to point to an existing application:"
-      echo "$NAME: $OPTION=\"$VALUE\""
-      ;;
-    nogrep)
-      echo "$NAME: error: couldn't find grep!"
-      echo "this script needs grep to be in your path in order to function." 
-      echo "you can get GNU grep from ftp://ftp.gnu.org/bin/gnu/grep/" && exit 1
-      ;;
-    url)
-      echo "it is suggested that you use qiv, xli (xsetbg), or xv."
-      echo "you can obtain them at the following locations:"
-      echo
-      echo "   qiv: http://www.klografx.de/software/qiv.shtml"
-      echo "   xli: http://pantransit.reptiles.org/prog/#xli"
-      echo "   xv: http://www.trilon.com/xv/downloads.html"
-      echo
-      echo "the above URLs are current as of 05/23/2000."
-  esac
-  exit 1	    
- }
- 
- 
- help_msg()
- {
-     echo "$NAME $VERSION: $MORE"
-     echo "options:"
-     echo
-     echo "  (none)                             image is set using default values"
-     echo
-     echo "  -full, -f                          image is set fullscreen"
-     echo "  -tile, -t                          image is set tiled"
-     echo "  -center, -c                        image is set centered"
-     echo
-     echo "  -app, -a <application>             image is set using <application> with"
-     echo "     <"'"application options"'">            quote-enclosed \"options\" and" 
-     echo "     -center, -c|-tile, -t|-full, -f    default fallback option"
-     echo
-     echo "  -display <string>                  display to connect to (bsetroot only)"
-     echo "  -mod <x> <y>                       sets bsetroot modula pattern"
-     echo "     -foreground, -fg <color>           modula foreground color"
-     echo "     -background, -bg <color>           modula background color"
-     echo
-     echo "  -gradient <texture>                sets bsetroot gradient texture"
-     echo "     -from <color>                      gradient start color"
-     echo "     -to <color>                        gradient end color"
-     echo
-     echo "  -solid <color>                     sets bsetroot solid color"
-     echo
-     echo "  -version, -v                       outputs $NAME's version number"
-     echo "  -info, -i                          outputs configuration info"
-     echo "  -help, -h                          this message"
-     echo
-     echo "usage: <options...> <image>"
-     exit 0 
- }
- 
- 
- info_msg()
- {
-     case $ERROR in
- 	[1-3])
- 	    SUMMARY="error: some variables are blank"
- 	    ;;
- 	4)
- 	    SUMMARY="no values have been specified"
- 	    ;;
-  	0)
- 	    SUMMARY="looks good"
-     esac
- 
-     case $APP_ERROR in [1-4])
- 	SUMMARY="error: some applications couldn't be found!"
-     esac
- 
-     case `which bsetroot 2>&1` in
- 	*/*bsetroot)
- 	    BSETROOT=`which bsetroot`
- 	    ;;
- 	*)
- 	    BSETROOT="(error: not found)"
- 	    case $ERROR in
- 		1-4)
- 		    SUMMARY="$SUMMARY, and bsetroot does not seem to be present."
- 		    ;;
- 		*)
- 		    SUMMARY="$SUMMARY, but bsetroot does not seem to be present."
- 	    esac
-     esac
- 
-     echo "$NAME $VERSION configuration:"
-     echo
-     echo "  bsetroot:                          $BSETROOT"
-     echo
-     echo "  reading configuration from:        $CONFIG"
-     echo
-     echo "  configuration values:"
-     echo
-     case $FULL_BGAPP_MSG in 
- 	*"not found")
- 	    echo "      fullscreen (ERROR):            $FULL_BGAPP_MSG"
- 	    ;;
- 	*)
- 	    echo "      fullscreen (FULL):             $FULL_MSG"
-     esac
- 
-     echo
- 
-     case $TILE_BGAPP_MSG in 
- 	*"not found")
- 	    echo "      tiled (ERROR):                 $TILE_BGAPP_MSG"
- 	    ;;
- 	*)
- 	    echo "      tiled (TILE):                  $TILE_MSG"
-     esac
- 
-     echo
- 
-     case $CENTER_BGAPP_MSG in 
- 	*"not found")
- 	    echo "      centered (ERROR):              $CENTER_BGAPP_MSG"
- 	    ;;
- 	*)
- 	    echo "      centered (CENTER):             $CENTER_MSG"
-     esac
- 
-     echo
- 
-     case $DEFAULT_BGAPP_MSG in 
- 	*"not found")
- 	    echo "      default (ERROR):               $DEFAULT_BGAPP_MSG"
- 	    ;;
- 	*)
- 	    echo "      default (DEFAULT):             $DEFAULT_MSG"
-     esac
-     echo
-     echo "  summary: $SUMMARY"
-     exit 0
+ PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+ 
+ display_full_cmd="display -geometry 800x600 -window root"
+ display_tile_cmd="display -window root"
+ display_center_cmd="display -backdrop -window root"
+ display_default_cmd="$display_center_cmd"
+ 
+ Esetroot_full_cmd="Esetroot -scale"
+ Esetroot_tile_cmd="Esetroot"
+ Esetroot_center_cmd="Esetroot -c"
+ Esetroot_default_cmd="$Esetroot_center_cmd"
+ 
+ wmsetbg_full_cmd="wmsetbg -s -S"
+ wmsetbg_tile_cmd="wmsetbg -t"
+ wmsetbg_center_cmd="wmsetbg -e"
+ wmsetbg_default_cmd="$wmsetbg_center_cmd"
+ 
+ qiv_full_cmd="qiv --root_s"
+ qiv_tile_cmd="qiv --root_t"
+ qiv_center_cmd="qiv --root"
+ qiv_default_cmd="$qiv_center_cmd"
+ 
+ xv_full_cmd="xv -max -smooth -root -quit"
+ xv_tile_cmd="xv -root -quit"
+ xv_center_cmd="xv -rmode 5 -root -quit"
+ xv_default_cmd="$xv_center_cmd"
+ 
+ xli_full_cmd="xli -fullscreen -onroot -quiet"
+ xli_tile_cmd="xli -onroot -quiet"
+ xli_center_cmd="xli -center -onroot quiet"
+ xli_default_cmd="$xli_center_cmd"
+ 
 -xsetbg_full_cmd="xsetbg -fullscreen"
++xsetbg_full_cmd="xsetbg -fillscreen"
+ xsetbg_tile_cmd="xsetbg"
+ xsetbg_center_cmd="xsetbg -center"
+ xsetbg_default_cmd="$xsetbg_center_cmd"
+ 
+ img_apps="qiv xli xv wmsetbg Esetroot display xsetbg"
+ me=${0##*/}
+ version=2.0
+ copyright="(c) 2000-$(date +%Y) by Timothy M. King (http://lordzork.com/)"
+ config=$HOME/.bsetbgrc
+ last_cmd_file=$HOME/.bsetbg_last_cmd
+ refresh_cmd=xrefresh
+ p=$me:
+ 
+ quit() {
+     [ "$1" ] && rc=$1 && shift 1
+     [ "$*" ] && echo -e $*
+     exit ${rc:-0}
  }
  
- 
- find_app()
- {
-     case `which $1 2>&1` in 
- 	*/*$1)
- 	    echo "$NAME: checking for $1... `which $1`"
- 	    echo "### $app" >> $TMPFILE
- 	    echo "# FULL=\"$full\"" >> $TMPFILE
- 	    echo "# TILE=\"$tile\"" >> $TMPFILE
- 	    echo "# CENTER=\"$center\"" >> $TMPFILE
- 	    echo "# DEFAULT=\"$default\"" >> $TMPFILE
- 	    echo >> $TMPFILE
- 
- 	    FULL=$full
- 	    TILE=$tile
- 	    CENTER=$center
- 	    DEFAULT=$default
- 	    APP=$app
- 	    ;;
- 	*)
- 	echo "$NAME: checking for $1... not found."
+ bool() {
+     case $1 in
+             [yY][eE][sS]|1|[yY]|[tT][rR][uU][eE]|[oO][nN]) : ;;
+             *) return 1 ;;
      esac
  }
  
diff --cc util/bsetroot.cc
index f0912cab,dce732aa..3452eaa2
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@@ -2,11 -2,14 +2,14 @@@
  #  include "../config.h"
  #endif // HAVE_CONFIG_H
  
- #ifdef    STDC_HEADERS
 -#ifdef    HAVE_STDLIB_H
 -#  include <stdlib.h>
 -#endif // HAVE_STDLIB_H
 -
+ #ifdef    HAVE_STRING_H
  #  include <string.h>
+ #endif // HAVE_STRING_H
+ 
++#ifdef    HAVE_STDLIB_H
 +#  include <stdlib.h>
- #endif // STDC_HEADERS
++#endif // HAVE_STDLIB_H
 +
  #ifdef    HAVE_STDIO_H
  #  include <stdio.h>
  #endif // HAVE_STDIO_H
@@@ -22,13 -26,9 +25,13 @@@ bsetroot::bsetroot(int argc, char **arg
    grad = fore = back = (char *) 0;
  
    Bool mod = False, sol = False, grd = False;
 -  int mod_x = 0, mod_y = 0;
 +  int mod_x = 0, mod_y = 0, i = 0;
 +
 +  img_ctrl = new BImageControl*[getNumberOfScreens()];
 +  for (; i < getNumberOfScreens(); i++)
-     img_ctrl[i] = new BImageControl(this, getScreenInfo(i), True);
++    img_ctrl[i] = new BImageControl(*this, *getScreenInfo(i), True);
  
 -  for (int i = 1; i < argc; i++) {
 +  for (i = 1; i < argc; i++) {
      if (! strcmp("-help", argv[i])) {
        usage();
      } else if ((! strcmp("-fg", argv[i])) ||
@@@ -219,9 -267,9 +222,9 @@@ void bsetroot::gradient(void) 
      if (! texture.getColorTo()->isAllocated())
        texture.getColorTo()->setPixel(BlackPixel(getXDisplay(), screen));
  
 -    Pixmap pixmap =
 +    pixmaps[screen] =
-       img_ctrl[screen]->renderImage(getScreenInfo(screen)->getWidth(),
-                                     getScreenInfo(screen)->getHeight(),
+       img_ctrl[screen]->renderImage(getScreenInfo(screen)->size().w(),
+                                     getScreenInfo(screen)->size().h(),
                                      &texture);
  
      XSetWindowBackgroundPixmap(getXDisplay(),