Slackware 13.1slackware-13.1

Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
author: Patrick J Volkerding <volkerdi@slackware.com> 2010-05-19 08:58:23 +0000
committer: Eric Hameleers <alien@slackware.com> 2018-05-31 22:43:05 +0200
commit: b76270bf9e6dd375e495fec92140a79a79415d27 (patch)
tree: 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/xap/blackbox
parent: 5a12e7c134274dba706667107d10d231517d3e05 (diff)
download: current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz
current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz
4 files changed, 198 insertions, 12497 deletions
diff --git a/source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch b/source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch
new file mode 100644
index 000000000..480b99e85
--- /dev/null
+++ b/source/xap/blackbox/blackbox-0.70.1-gcc-4.3.patch
@@ -0,0 +1,109 @@
+http://mirrors.usc.edu/pub/linux/distributions/gentoo/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
+
+
+diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc
+--- blackbox-0.70.1.orig/lib/Image.cc	2005-04-08 17:41:09.000000000 +0200
++++ blackbox-0.70.1/lib/Image.cc	2008-02-24 08:31:28.000000000 +0100
+@@ -42,8 +42,9 @@
+ 
+ #include <assert.h>
+ #include <math.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ // #define COLORTABLE_DEBUG
+ // #define MITSHM_DEBUG
+diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
+--- blackbox-0.70.1.orig/lib/Resource.cc	2005-04-06 23:16:50.000000000 +0200
++++ blackbox-0.70.1/lib/Resource.cc	2008-02-24 08:33:11.000000000 +0100
+@@ -28,7 +28,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ 
+ bt::Resource::Resource(void)
+diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
+--- blackbox-0.70.1.orig/lib/XDG.cc	2005-04-06 16:04:38.000000000 +0200
++++ blackbox-0.70.1/lib/XDG.cc	2008-02-24 08:34:11.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include "Util.hh"
+ #include "XDG.hh"
+ 
+-#include <stdlib.h>
++#include <cstdlib>
++#include <algorithm>
+ 
+ 
+ // make sure directory names end with a slash
+diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
+--- blackbox-0.70.1.orig/src/BlackboxResource.cc	2005-10-18 09:34:46.000000000 +0200
++++ blackbox-0.70.1/src/BlackboxResource.cc	2008-02-24 08:34:49.000000000 +0100
+@@ -33,6 +33,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <cstring>
++
+ 
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
+   screen_resources = 0;
+diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
+--- blackbox-0.70.1.orig/src/main.cc	2005-01-03 10:42:57.000000000 +0100
++++ blackbox-0.70.1/src/main.cc	2008-02-24 08:37:16.000000000 +0100
+@@ -34,7 +34,8 @@
+ #include "blackbox.hh"
+ #include "../version.h"
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ 
+ static void showHelp(int exitval) {
+diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
+--- blackbox-0.70.1.orig/src/Screen.cc	2005-10-18 10:07:22.000000000 +0200
++++ blackbox-0.70.1/src/Screen.cc	2008-02-24 08:35:46.000000000 +0100
+@@ -45,8 +45,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>
+-#include <ctype.h>
+ #include <dirent.h>
++#include <cctype>
++#include <cstring>
+ 
+ 
+ static bool running = true;
+diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
+--- blackbox-0.70.1.orig/src/ScreenResource.cc	2005-04-13 07:54:08.000000000 +0200
++++ blackbox-0.70.1/src/ScreenResource.cc	2008-02-24 08:36:31.000000000 +0100
+@@ -33,6 +33,8 @@
+ 
+ #include <assert.h>
+ 
++#include <cstring>
++
+ 
+ static const int iconify_width  = 9;
+ static const int iconify_height = 9;
+diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
+--- blackbox-0.70.1.orig/util/bsetroot.cc	2005-03-15 08:01:37.000000000 +0100
++++ blackbox-0.70.1/util/bsetroot.cc	2008-02-24 08:38:41.000000000 +0100
+@@ -30,7 +30,9 @@
+ #include <cctype>
+ 
+ #include <X11/Xatom.h>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ 
+ // ignore all X errors
diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild
index 4505d06e3..130355f4b 100755
--- a/source/xap/blackbox/blackbox.SlackBuild
+++ b/source/xap/blackbox/blackbox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,23 +20,48 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%200.70.1/blackbox-0.70.1.tar.bz2
+# http://downloads.sourceforge.net/project/bbkeys/bbkeys/0.9.1/bbkeys-0.9.1.tar.gz
 
 PKGNAM=blackbox
-VERSION=${VERSION:-0.65.0}
-BBVER=${BBVER:-0.8.6}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-4}
-
+VERSION=${VERSION:-0.70.1}
+BBKEYSVER=${BBKEYSVER:-0.9.1}
+BUILD=${BUILD:-3}
 NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGEXT=${PKGEXT:-txz}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
+# Determine the CFLAGS for the known architectures:
+case $ARCH in
+  i486)   export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+          export LIBDIRSUFFIX=""
+          export ARCHQUADLET="" ;;
+  i686)   export SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+          export LIBDIRSUFFIX=""
+          export ARCHQUADLET="" ;;
+  x86_64) export SLKCFLAGS="-O2 -fPIC"
+          export LIBDIRSUFFIX="64"
+          export ARCHQUADLET="" ;;
+  s390)   export SLKCFLAGS="-O2"
+          export LIBDIRSUFFIX=""
+          export ARCHQUADLET="" ;;
+  arm)    export SLKCFLAGS="-O2 -march=armv4t"
+          export LIBDIRSUFFIX="" 
+          export ARCHQUADLET="-gnueabi" ;;
+  *)      export SLKCFLAGS="-O2"
+          export LIBDIRSUFFIX=""
+          export ARCHQUADLET="" ;;
+esac
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -46,7 +71,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
@@ -57,24 +82,33 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Thanks for the gcc-4.1.1 patch, Debian.  :-)
-zcat $CWD/blackbox_0.65.0-5.diff.gz | patch -p1 --verbose || exit 1
+# Build fix for gcc-4:
+zcat $CWD/blackbox-0.70.1-gcc-4.3.patch.gz | patch --verbose -p1 || exit 1
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-shape \
   --enable-slit \
   --enable-interlace \
   --enable-nls \
+  --enable-shared=yes \
+  --enable-static=no \
   --enable-timed-cache \
-  $ARCH-slackware-linux
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1
 
-# Build and install:
+# Build:
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
 
+# Install onto filesystem - needed for bbkeys to find libbt:
+make install || exit 1
+
+# Install into package:
+make install DESTDIR=$PKG || exit 1
 mkdir -p $PKG/etc/X11/xinit
 zcat $CWD/xinitrc.blackbox.gz > $PKG/etc/X11/xinit/xinitrc.blackbox
 chmod 755 $PKG/etc/X11/xinit/xinitrc.blackbox
@@ -85,12 +119,20 @@ cp -a \
   AUTHORS INSTALL LICENSE README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 ######################################
 # Compile bbkeys program for blackbox:
 cd $TMP
-rm -rf bbkeys-${BBVER}
-tar xvf $CWD/bbkeys-${BBVER}.tar.gz || exit 1
-cd bbkeys-${BBVER} || exit 1
+rm -rf bbkeys-${BBKEYSVER}
+tar xvf $CWD/bbkeys-${BBKEYSVER}.tar.xz
+cd bbkeys-${BBKEYSVER} || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -104,18 +146,27 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-interlace \
-  $ARCH-slackware-linux
+  --infodir=/usr/info \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/bbkeys-$BBKEYSVER \
+  --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1
+
+# --docdir isn't honoured:
+sed -i 's?^docdir.*=.*?docdir = /usr/doc/bbkeys-'"$BBKEYSVER"'?g' Makefile
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/bbkeys-${BBKEYSVER})
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
-# Build and install:
+# Build and install into package:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-mkdir -p /usr/doc/bbkeys-$BBKEYS
-cp -a \
-  AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README* TODO \
-  /usr/doc/bbkeys-$BBKEYS
-
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -135,9 +186,12 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
+# Set doc permissions:
+find $PKG/usr/doc -type f -print0 | xargs -0 chmod 644
+find $PKG/usr/doc -type d -print0 | xargs -0 chmod 755
+
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+install -vpm644 $CWD/slack-desc $PKG/install/
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.$PKGEXT
diff --git a/source/xap/blackbox/blackbox_0.65.0-5.diff b/source/xap/blackbox/blackbox_0.65.0-5.diff
deleted file mode 100644
index 4b6959d85..000000000
--- a/source/xap/blackbox/blackbox_0.65.0-5.diff
+++ /dev/null
@@ -1,12462 +0,0 @@
---- blackbox-0.65.0.orig/Makefile.in
-+++ blackbox-0.65.0/Makefile.in
-@@ -68,6 +68,7 @@
- ORDEREDPSEUDO = @ORDEREDPSEUDO@
- PACKAGE = @PACKAGE@
- SHAPE = @SHAPE@
-+XINERAMA = @XINERAMA@
- TIMEDCACHE = @TIMEDCACHE@
- VERSION = @VERSION@
- gencat_cmd = @gencat_cmd@
---- blackbox-0.65.0.orig/configure
-+++ blackbox-0.65.0/configure
-@@ -1,42 +1,325 @@
- #! /bin/sh
--
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.13 
--# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by GNU Autoconf 2.59.
- #
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+  set -o posix
-+fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$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" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.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
-+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+	     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
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval 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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
- 
--# Defaults:
--ac_help=
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" 	$as_nl"
-+
-+# CDPATH.
-+$as_unset 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.
-+#
- ac_default_prefix=/usr/local
--# 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-ordered-pseudo include code for ordered pseudocolor (8bpp)
--                          dithering [default=no]"
--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"
-+ac_config_libobj_dir=.
-+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/blackbox.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"
-+
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX regex_cmd CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SHAPE XINERAMA ORDEREDPSEUDO DEBUG NLS gencat_cmd TIMEDCACHE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBOBJS LTLIBOBJS'
-+ac_subst_files=''
- 
- # 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.
--build=NONE
--cache_file=./config.cache
-+cache_file=/dev/null
- exec_prefix=NONE
--host=NONE
- no_create=
--nonopt=NONE
- no_recursion=
- prefix=NONE
- program_prefix=NONE
-@@ -45,10 +328,15 @@
- 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'
-@@ -62,17 +350,9 @@
- 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"
-@@ -80,59 +360,59 @@
-     continue
-   fi
- 
--  case "$ac_option" in
--  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
--  *) ac_optarg= ;;
--  esac
-+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
- 
-   # 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 ;;
-+    ac_prev=build_alias ;;
-   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
--    build="$ac_optarg" ;;
-+    build_alias=$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" ;;
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
- 
-   -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=`echo $ac_option|sed -e 's/-*disable-//'`
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    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" ;;
-+    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" ;;
- 
-   -enable-* | --enable-*)
--    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    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
--      *=*) ;;
-+    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"`;;
-       *) 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- \
-@@ -141,95 +421,47 @@
-   -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)
--    # 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 ;;
-+  -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 ;;
- 
-   -host | --host | --hos | --ho)
--    ac_prev=host ;;
-+    ac_prev=host_alias ;;
-   -host=* | --host=* | --hos=* | --ho=*)
--    host="$ac_optarg" ;;
-+    host_alias=$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 \
-@@ -238,19 +470,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)
-+  | --no-cr | --no-c | -n)
-     no_create=yes ;;
- 
-   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-@@ -264,26 +496,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 \
-@@ -300,7 +532,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)
-@@ -310,7 +542,7 @@
-     ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-   | --sbi=* | --sb=*)
--    sbindir="$ac_optarg" ;;
-+    sbindir=$ac_optarg ;;
- 
-   -sharedstatedir | --sharedstatedir | --sharedstatedi \
-   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-@@ -321,58 +553,57 @@
-   | --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 ;;
-+    ac_prev=target_alias ;;
-   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
--    target="$ac_optarg" ;;
-+    target_alias=$ac_optarg ;;
- 
-   -v | -verbose | --verbose | --verbos | --verbo | --verb)
-     verbose=yes ;;
- 
--  -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.13"
--    exit 0 ;;
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
- 
-   -with-* | --with-*)
--    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    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
-+    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'`
--    case "$ac_option" in
--      *=*) ;;
-+    case $ac_option in
-+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-       *) ac_optarg=yes ;;
-     esac
--    eval "with_${ac_package}='$ac_optarg'" ;;
-+    eval "with_$ac_package='$ac_optarg'" ;;
- 
-   -without-* | --without-*)
--    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    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" ;;
-+    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" ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -383,99 +614,110 @@
-     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 "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+  -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); 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 ;;
-+
-   *)
--    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"
-+    # 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}
-     ;;
- 
-   esac
- done
- 
- if test -n "$ac_prev"; then
--  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
--fi
--
--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
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  { echo "$as_me: error: missing argument to $ac_option" >&2
-+   { (exit 1); exit 1; }; }
- fi
--exec 5>./config.log
- 
--echo "\
--This file contains any messages produced by compilers while
--running configure, to aid debugging if configure makes a mistake.
--" 1>&5
-+# 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
- 
--# 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
-+# Be sure to have absolute paths.
-+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-+	      localstatedir libdir includedir oldincludedir infodir mandir
- do
--  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" ;;
-+  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; }; };;
-   esac
- done
- 
--# 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
-+# 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
- 
--# 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
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
- 
--# 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/blackbox.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_prog=$0
--  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
--  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-+  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'`
-   srcdir=$ac_confdir
-   if test ! -r $srcdir/$ac_unique_file; then
-     srcdir=..
-@@ -485,13 +727,491 @@
- fi
- if test ! -r $srcdir/$ac_unique_file; then
-   if test "$ac_srcdir_defaulted" = yes; then
--    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-+   { (exit 1); exit 1; }; }
-   else
--    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+   { (exit 1); exit 1; }; }
-   fi
- fi
--srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+   { (exit 1); exit 1; }; }
-+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-xinerama      enable support of the xinerama extension default=yes
-+  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
-+                          dithering default=no
-+  --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
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
-+
-+    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 (C) 2003 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.59.  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.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_sep=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    2)
-+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+      # Get rid of the leading space.
-+      ac_sep=" "
-+      ;;
-+    esac
-+  done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+
-+# 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
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=$`echo $ac_var`
-+      echo "$ac_var='"'"'$ac_val'"'"'"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+## ------------- ##
-+## Output files. ##
-+## ------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=$`echo $ac_var`
-+	echo "$ac_var='"'"'$ac_val'"'"'"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      sed "/^$/d" confdefs.h | sort
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f 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
-+
-+
-+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
-@@ -502,39 +1222,103 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    echo "loading site script $ac_site_file"
-+    { 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
-     . "$ac_site_file"
-   fi
- done
- 
- if test -r "$cache_file"; then
--  echo "loading cache $cache_file"
--  . $cache_file
-+  # 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
- else
--  echo "creating cache $cache_file"
--  > $cache_file
-+  { 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; }; }
- 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-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_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_aux_dir=
-@@ -547,14 +1331,20 @@
-     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 "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
--fi
--ac_config_guess=$ac_aux_dir/config.guess
--ac_config_sub=$ac_aux_dir/config.sub
--ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+  { { 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; }; }
-+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.
- 
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
-@@ -563,65 +1353,80 @@
- # 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"
-+# OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:572: checking for a BSD compatible install" >&5
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+  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/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  /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 $ac_dir/$ac_prog >/dev/null 2>&1; then
-+	    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="$ac_dir/$ac_prog -c"
--	    break 2
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
- 	  fi
- 	fi
-       done
--      ;;
--    esac
--  done
--  IFS="$ac_save_IFS"
-+    done
-+    ;;
-+esac
-+done
-+
- 
- 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 "$ac_t""$INSTALL" 1>&6
-+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_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:625: checking whether build environment is sane" >&5
-+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -643,8 +1448,11 @@
-       # 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 "configure: error: ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" 1>&2; exit 1; }
-+      { { 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; }; }
-    fi
- 
-    test "$2" = conftestfile
-@@ -653,54 +1461,54 @@
-    # Ok.
-    :
- else
--   { echo "configure: error: newly created file is older than distributed files!
--Check your system clock" 1>&2; exit 1; }
-+   { { 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; }; }
- fi
- rm -f conftest*
--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
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- 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"
--
--# 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:682: 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
-+  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 > conftestmake <<\EOF
-+  cat >conftest.make <<\_ACEOF
- all:
--	@echo 'ac_maketemp="${MAKE}"'
--EOF
-+	@echo 'ac_maketemp="$(MAKE)"'
-+_ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+eval `${MAKE-make} -f conftest.make 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 conftestmake
-+rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -710,75 +1518,87 @@
- VERSION=0.65.0
- 
- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-+  { { 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; }; }
- fi
- 
- 
- 
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:721: checking for working aclocal" >&5
-+echo "$as_me:$LINENO: checking for working aclocal" >&5
-+echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
- # 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 "$ac_t""found" 1>&6
-+   echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
-    ACLOCAL="$missing_dir/missing aclocal"
--   echo "$ac_t""missing" 1>&6
-+   echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
- 
--echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:734: checking for working autoconf" >&5
-+echo "$as_me:$LINENO: checking for working autoconf" >&5
-+echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
- # 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 "$ac_t""found" 1>&6
-+   echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
-    AUTOCONF="$missing_dir/missing autoconf"
--   echo "$ac_t""missing" 1>&6
-+   echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
- 
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:747: checking for working automake" >&5
-+echo "$as_me:$LINENO: checking for working automake" >&5
-+echo $ECHO_N "checking for working automake... $ECHO_C" >&6
- # 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 "$ac_t""found" 1>&6
-+   echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
-    AUTOMAKE="$missing_dir/missing automake"
--   echo "$ac_t""missing" 1>&6
-+   echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
- 
--echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:760: checking for working autoheader" >&5
-+echo "$as_me:$LINENO: checking for working autoheader" >&5
-+echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
- # 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 "$ac_t""found" 1>&6
-+   echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
-    AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$ac_t""missing" 1>&6
-+   echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
- 
--echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:773: checking for working makeinfo" >&5
-+echo "$as_me:$LINENO: checking for working makeinfo" >&5
-+echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
- # 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 "$ac_t""found" 1>&6
-+   echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
-    MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$ac_t""missing" 1>&6
-+   echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
- 
- 
-@@ -786,214 +1606,657 @@
- test x$prefix = "xNONE" && prefix="$ac_default_prefix"
- 
- 
--# 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:793: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+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
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_CC="gcc"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
-+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"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$ac_t""$CC" 1>&6
-+  echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:823: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+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 "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_prog_rejected=no
--  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"
-+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
-+
-+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 "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
-+else
-+  CC="$ac_cv_prog_CC"
-+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
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  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
-+
- 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 $# -gt 0; then
-+  if test $# != 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 "$ac_dir/$ac_word" "$@"
--    shift
--    ac_cv_prog_CC="$@"
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-   fi
- fi
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$ac_t""$CC" 1>&6
-+  echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--  if test -z "$CC"; then
--    case "`uname -s`" in
--    *win32* | *WIN32*)
--      # Extract the first word of "cl", so it can be a program name with args.
--set dummy cl; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:874: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+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
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_CC="cl"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
-+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
-+
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$ac_t""$CC" 1>&6
-+  echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-- ;;
--    esac
-+
-+    test -n "$CC" && break
-+  done
-+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
-   fi
--  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+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
- 
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:906: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+  test -n "$ac_ct_CC" && break
-+done
- 
--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
-+  CC=$ac_ct_CC
-+fi
- 
--cat > conftest.$ac_ext << EOF
-+fi
- 
--#line 917 "configure"
--#include "confdefs.h"
- 
--main(){return(0);}
--EOF
--if { (eval echo configure:922: \"$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
--    ac_cv_prog_cc_cross=yes
--  fi
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&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 <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# 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 file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $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=
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+	;;
-+    conftest.$ac_ext )
-+	# This is the source file.
-+	;;
-+    [ab].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,
-+	# but it would be cool to find out if it's true.  Does anybody
-+	# maintain Libtool? --akim.
-+	export ac_cv_exeext
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
- else
--  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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--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; }
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C compiler cannot create executables
-+See \`config.log' for more details." >&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
-+  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'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+  fi
- fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
--cross_compiling=$ac_cv_prog_cc_cross
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- 
--echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:953: 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
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+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 conftest.exe conftest conftest.*; do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	  export ac_cv_exeext
-+	  break;;
-+    * ) break;;
-+  esac
-+done
- else
--  cat > conftest.c <<EOF
--#ifdef __GNUC__
--  yes;
--#endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
--  ac_cv_prog_gcc=yes
-+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6
-+
-+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
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+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 | *.xSYM | *.bb | *.bbg ) ;;
-+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
- else
--  ac_cv_prog_gcc=no
--fi
--fi
--
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--if test $ac_cv_prog_gcc = yes; then
--  GCC=yes
--else
--  GCC=
--fi
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
- 
--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:981: 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
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.err 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_cv_prog_cc_g=yes
- else
--  ac_cv_prog_cc_g=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_prog_cc_g=no
- fi
--
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&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"
-@@ -1007,136 +2270,494 @@
-     CFLAGS=
-   fi
- fi
--
--for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std1 is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std1.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX			-qlanglvl=ansi
-+# Ultrix and OSF/1	-std1
-+# HP-UX 10.20 and later	-Ae
-+# HP-UX older versions	-Aa -D_HPUX_SOURCE
-+# SVR4			-Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- 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:1017: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  CC="$ac_save_CC $ac_arg"
-+  rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_cv_prog_cc_stdc=$ac_arg
-+break
- else
--  if test -n "$CXX"; then
--  ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_prog"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
-+rm -f conftest.err conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
- fi
--CXX="$ac_cv_prog_CXX"
--if test -n "$CXX"; then
--  echo "$ac_t""$CXX" 1>&6
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+  x|xno)
-+    echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+  *)
-+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+esac
-+
-+# 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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 \
-+   '' \
-+   '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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_declaration
-+#include <stdlib.h>
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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 "$ac_t""no" 1>&6
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
- fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_declaration
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--test -n "$CXX" && break
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
--test -n "$CXX" || CXX="gcc"
-+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
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1049: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+fi
-+rm -f conftest.err 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=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_ext=cc
- 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 1060 "configure"
--#include "confdefs.h"
--
--int main(){return(0);}
--EOF
--if { (eval echo configure:1065: \"$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
-+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
-+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
-+
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+  echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  ac_cv_prog_cxx_works=no
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
- 
--echo "$ac_t""$ac_cv_prog_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; }
-+    test -n "$CXX" && break
-+  done
- fi
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1091: 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
--
--echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
--echo "configure:1096: 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
-+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
--  cat > conftest.C <<EOF
--#ifdef __GNUC__
--  yes;
--#endif
--EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
--  ac_cv_prog_gxx=yes
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
- else
--  ac_cv_prog_gxx=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
-+    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
-+done
-+
- 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
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
- 
--echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-+  test -n "$ac_ct_CXX" && break
-+done
-+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
--if test $ac_cv_prog_gxx = yes; then
--  GXX=yes
--else
--  GXX=
-+  CXX=$ac_ct_CXX
- 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:1124: 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
-+
-+# 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.err 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_cv_prog_cxx_g=yes
- else
--  ac_cv_prog_cxx_g=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_prog_cxx_g=no
- fi
--
--echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&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"
-@@ -1150,6 +2771,115 @@
-     CXXFLAGS=
-   fi
- fi
-+for ac_declaration in \
-+   '' \
-+   '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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_declaration
-+#include <stdlib.h>
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_declaration
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err 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
-@@ -1158,505 +2888,1513 @@
- # 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"
-+# OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:1167: checking for a BSD compatible install" >&5
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+  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/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  /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 $ac_dir/$ac_prog >/dev/null 2>&1; then
-+	    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="$ac_dir/$ac_prog -c"
--	    break 2
-+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	    break 3
- 	  fi
- 	fi
-       done
--      ;;
--    esac
--  done
--  IFS="$ac_save_IFS"
-+    done
-+    ;;
-+esac
-+done
-+
- 
- 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 "$ac_t""$INSTALL" 1>&6
-+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_PROGRAM}'
-+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.
-+  # 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:1225: 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
-+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
--  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"
-+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"
-+regex_cmd=$ac_cv_prog_regex_cmd
- if test -n "$regex_cmd"; then
--  echo "$ac_t""$regex_cmd" 1>&6
-+  echo "$as_me:$LINENO: result: $regex_cmd" >&5
-+echo "${ECHO_T}$regex_cmd" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--test -n "$regex_cmd" && break
-+  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; }
-+  { { 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
- 
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1259: checking how to run the C preprocessor" >&5
-+
-+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 eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  if test "${ac_cv_prog_CPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--    # This must be in double quotes, not single quotes, because CPP may get
--  # substituted into the Makefile and "${CC-cc}" will confuse make.
--  CPP="${CC-cc} -E"
-+      # 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.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp.
--  cat > conftest.$ac_ext <<EOF
--#line 1274 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1280: \"$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
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-   :
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -E -traditional-cpp"
--  cat > conftest.$ac_ext <<EOF
--#line 1291 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1297: \"$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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
-+sed 's/^/| /' 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.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
-+sed 's/^/| /' 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_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
-+sed 's/^/| /' 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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -nologo -E"
--  cat > conftest.$ac_ext <<EOF
--#line 1308 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1314: \"$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
-+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&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 egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+if test "${ac_cv_prog_egrep+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+    then ac_cv_prog_egrep='grep -E'
-+    else ac_cv_prog_egrep='egrep'
-+    fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
-+
-+
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_cv_header_stdc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
-+fi
-+rm -f conftest.err conftest.$ac_objext 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then
-   :
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP=/lib/cpp
-+  ac_cv_header_stdc=no
- fi
- rm -f conftest*
-+
- fi
--rm -f conftest*
-+
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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*
--  ac_cv_prog_CPP="$CPP"
-+
- fi
--  CPP="$ac_cv_prog_CPP"
-+
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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
--  ac_cv_prog_CPP="$CPP"
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
- fi
--echo "$ac_t""$CPP" 1>&6
-+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
- 
--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 stdlib.h string.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
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1342: 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 1347 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1352: \"$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*
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err 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
-+
-+fi
-+
-+done
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+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 stdlib.h string.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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- 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
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+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:$ac_c_preproc_warn_flag 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 compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  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: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&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;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists.  ##
-+## ------------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&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"
-+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
-+
- fi
-+
- done
- 
--echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:1379: checking whether time.h and sys/time.h may both be included" >&5
--if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 1384 "configure"
--#include "confdefs.h"
-+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
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
--int main() {
--struct tm *tp;
--; return 0; }
--EOF
--if { (eval echo configure:1393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_cv_header_time=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_header_time=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_time=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_header_time" 1>&6
-+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 <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define TIME_WITH_SYS_TIME 1
--EOF
-+_ACEOF
- 
- fi
- 
- 
-+
- for ac_func in basename
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1417: 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 1422 "configure"
--#include "confdefs.h"
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func(); below.  */
--#include <assert.h>
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
- /* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err 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
-+LIBS="-lgen  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_gen_basename=no
-+fi
-+rm -f conftest.err 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
-+#define HAVE_BASENAME 1
-+_ACEOF
-+ LIBS="$LIBS -lgen"
-+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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* 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();
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
- 
--int main() {
-+int
-+main ()
-+{
-+return f != $ac_func;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err 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
-+
-+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
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_nsl_t_open=no
-+fi
-+rm -f conftest.err 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
-+  LIBS="$LIBS -lnsl"
-+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
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_socket=no
-+fi
-+rm -f conftest.err 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"
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6
-+
-+ac_path_x_has_been_run=yes
-+
-+# Check whether --with-x or --without-x was given.
-+if test "${with_x+set}" = set; then
-+  withval="$with_x"
-+
-+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.
-+  have_x=disabled
-+else
-+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-+    # 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
-+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
-+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-+  cat >Imakefile <<'_ACEOF'
-+acfindx:
-+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+_ACEOF
-+  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
-+	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
-+	/usr/include) ;;
-+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-+    esac
-+    case $ac_im_usrlibdir in
-+	/usr/lib | /lib) ;;
-+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-+    esac
-+  fi
-+  cd ..
-+  rm -fr conftest.dir
-+fi
- 
--/* 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
--$ac_func();
--#endif
-+# 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
- 
--; return 0; }
--EOF
--if { (eval echo configure:1445: \"$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
-+/usr/openwin/include
-+/usr/openwin/share/include'
- 
--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:1467: 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
-+if test "$ac_x_includes" = no; then
-+  # Guess where to find include files, by looking for a specified header file.
-+  # First, try using that file with no special directory specified.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  ac_save_LIBS="$LIBS"
--LIBS="-lgen  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1475 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char basename();
--
--int main() {
--basename()
--; return 0; }
--EOF
--if { (eval echo configure:1486: \"$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"
-+  ac_cpp_err=yes
- 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
--EOF
-- LIBS="$LIBS -lgen"
-+if test -z "$ac_cpp_err"; then
-+  # We can compile using X headers with no special include directory.
-+ac_x_includes=
- else
--  echo "$ac_t""no" 1>&6
--fi
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
-+  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
--
--for ac_func in getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1515: 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 1520 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char $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
--$ac_func();
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:1543: \"$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
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = no
- 
--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
-- 
-+if test "$ac_x_libraries" = no; then
-+  # Check for the libraries.
-+  # 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Intrinsic.h>
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+# We can link X programs with no special library path.
-+ac_x_libraries=
- else
--  echo "$ac_t""no" 1>&6
--fi
--done
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
--echo "configure:1568: 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_save_LIBS="$LIBS"
--LIBS="-lnsl  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1576 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char t_open();
--
--int main() {
--t_open()
--; return 0; }
--EOF
--if { (eval echo configure:1587: \"$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"
-+LIBS=$ac_save_LIBS
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-+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
-+      ac_x_libraries=$ac_dir
-+      break 2
-+    fi
-+  done
-+done
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = no
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  LIBS="$LIBS -lnsl"
-+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
--  echo "$ac_t""no" 1>&6
-+  # Record where we found X for the cache.
-+  ac_cv_have_x="have_x=yes \
-+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
- fi
--
--echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:1608: 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_save_LIBS="$LIBS"
--LIBS="-lsocket  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1616 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char socket();
--
--int main() {
--socket()
--; return 0; }
--EOF
--if { (eval echo configure:1627: \"$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"
-+  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
-+  no_x=yes
- else
--  echo "$ac_t""no" 1>&6
-+  # If each of the values was on the command line, it overrides each guess.
-+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-+  # 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"
-+  # It might be that x_includes is empty (headers are found in the
-+  # standard search path. Then output the corresponding message
-+  ac_out_x_includes=$x_includes
-+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
- fi
- 
- 
--# 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:1653: checking for X" >&5
-+if test "x$ac_path_x_has_been_run" != xyes; then
-+  echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6
-+
-+ac_path_x_has_been_run=yes
- 
- # 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.
-@@ -1666,207 +4404,209 @@
-     # Both variables are already set.
-     have_x=yes
-   else
--if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+    if test "${ac_cv_have_x+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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 conftestdir
--if mkdir conftestdir; then
--  cd conftestdir
-+ac_x_includes=no ac_x_libraries=no
-+rm -fr conftest.dir
-+if mkdir conftest.dir; then
-+  cd conftest.dir
-   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
--  cat > Imakefile <<'EOF'
-+  cat >Imakefile <<'_ACEOF'
- acfindx:
- 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
--EOF
-+_ACEOF
-   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
--        ac_im_usrlibdir=$ac_im_libdir; break
-+	 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 conftestdir
-+  rm -fr conftest.dir
- fi
- 
--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
-+# 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 a specified header file.
-   # First, try using that file with no special directory specified.
--cat > conftest.$ac_ext <<EOF
--#line 1715 "configure"
--#include "confdefs.h"
--#include <$x_direct_test_include>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1720: \"$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*
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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=$?
-+  grep -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
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' 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
- fi
--rm -f conftest*
--fi # $ac_x_includes = NO
-+rm -f conftest.err conftest.$ac_ext
-+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="-l$x_direct_test_library $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1789 "configure"
--#include "confdefs.h"
--
--int main() {
--${x_direct_test_function}()
--; return 0; }
--EOF
--if { (eval echo configure:1796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  LIBS="$ac_save_LIBS"
-+  ac_save_LIBS=$LIBS
-+  LIBS="-lXt $LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Intrinsic.h>
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
- # We can link X programs with no special library path.
- ac_x_libraries=
- else
--  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 \
--    ; \
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' 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`
- 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/lib${x_direct_test_library}.$ac_extension; then
-+    if test -r $ac_dir/libXt.$ac_extension; then
-       ac_x_libraries=$ac_dir
-       break 2
-     fi
-   done
- done
- fi
--rm -f conftest*
--fi # $ac_x_libraries = NO
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+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
-   # Record where we found X for the cache.
-   ac_cv_have_x="have_x=yes \
--	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-+		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 "$ac_t""$have_x" 1>&6
-+  echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6
-   no_x=yes
- else
-   # If each of the values was on the command line, it overrides each guess.
-@@ -1875,14 +4615,21 @@
-   # 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 "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-+  # It might be that x_includes is empty (headers are found in the
-+  # standard search path. Then output the corresponding message
-+  ac_out_x_includes=$x_includes
-+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
- fi
- 
-+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 <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define X_DISPLAY_MISSING 1
--EOF
-+_ACEOF
- 
-   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
- else
-@@ -1895,60 +4642,117 @@
-     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 $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:1902: 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 1905 "configure"
--#include "confdefs.h"
--
--int main() {
--
--; return 0; }
--EOF
--if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+      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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_R_nospace=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_R_nospace=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_R_nospace=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-       if test $ac_R_nospace = yes; then
--	echo "$ac_t""no" 1>&6
-+	echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- 	X_LIBS="$X_LIBS -R$x_libraries"
-       else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
--	cat > conftest.$ac_ext <<EOF
--#line 1928 "configure"
--#include "confdefs.h"
--
--int main() {
--
--; return 0; }
--EOF
--if { (eval echo configure:1935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_R_space=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_R_space=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_R_space=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
- 	if test $ac_R_space = yes; then
--	  echo "$ac_t""yes" 1>&6
-+	  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- 	  X_LIBS="$X_LIBS -R $x_libraries"
- 	else
--	  echo "$ac_t""neither works" 1>&6
-+	  echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6
- 	fi
-       fi
--      LIBS="$ac_xsave_LIBS"
-+      LIBS=$ac_xsave_LIBS
-     esac
-   fi
- 
-@@ -1959,527 +4763,1010 @@
-   if test "$ISC" = yes; then
-     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-   else
--    # 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
-+    # Martyn Johnson says this is needed for Ultrix, if the X
-+    # libraries were built with DECnet support.  And Karl Berry says
-     # the Alpha needs dnet_stub (dnet does not exist).
--    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:1967: 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
-+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' 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_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1975 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char dnet_ntoa();
--
--int main() {
--dnet_ntoa()
--; return 0; }
--EOF
--if { (eval echo configure:1986: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dnet_dnet_ntoa=no
-+fi
-+rm -f conftest.err 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
-   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 $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:2008: 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
-+      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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2016 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char dnet_ntoa();
--
--int main() {
--dnet_ntoa()
--; return 0; }
--EOF
--if { (eval echo configure:2027: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dnet_stub_dnet_ntoa=no
-+fi
-+rm -f conftest.err 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
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
-     fi
-+fi
-+rm -f conftest.err 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@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-+    # Chad R. Larson 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 dickey@clark.net.
--    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:2056: 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 2061 "configure"
--#include "confdefs.h"
-+    # 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define gethostbyname innocuous_gethostbyname
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char gethostbyname(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char gethostbyname();
-+    which can conflict with char gethostbyname (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
- 
--int main() {
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- 
-+#undef gethostbyname
-+
-+/* 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 ();
- /* 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
--gethostbyname();
-+char (*f) () = gethostbyname;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2084: \"$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
-+int
-+main ()
-+{
-+return f != 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  :
--else
--  echo "$ac_t""no" 1>&6
-+ac_cv_func_gethostbyname=no
- fi
-+rm -f conftest.err 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
- 
-     if test $ac_cv_func_gethostbyname = no; then
--      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:2105: 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
-+      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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2113 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char gethostbyname();
--
--int main() {
--gethostbyname()
--; return 0; }
--EOF
--if { (eval echo configure:2124: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_nsl_gethostbyname=no
-+fi
-+rm -f conftest.err 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"
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
-+      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
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_bsd_gethostbyname=no
-+fi
-+rm -f conftest.err 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"
-+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@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:2154: 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 2159 "configure"
--#include "confdefs.h"
-+    # on later versions), says Simon Leinen: it contains gethostby*
-+    # variants that don't use the name server (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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define connect innocuous_connect
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char connect(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char connect();
-+    which can conflict with char connect (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- 
--int main() {
-+#undef connect
- 
-+/* 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 ();
- /* 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
--connect();
-+char (*f) () = connect;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2182: \"$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
-+int
-+main ()
-+{
-+return f != 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  :
--else
--  echo "$ac_t""no" 1>&6
-+ac_cv_func_connect=no
- fi
-+rm -f conftest.err 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
- 
-     if test $ac_cv_func_connect = no; then
--      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:2203: 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
-+      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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2211 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char connect();
--
--int main() {
--connect()
--; return 0; }
--EOF
--if { (eval echo configure:2222: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_connect=no
-+fi
-+rm -f conftest.err 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
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
-     fi
- 
--    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
--    echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:2246: checking for remove" >&5
--if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2251 "configure"
--#include "confdefs.h"
-+    # 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
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define remove innocuous_remove
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char remove(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char remove();
-+    which can conflict with char remove (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
- 
--int main() {
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- 
-+#undef remove
-+
-+/* 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 ();
- /* 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
--remove();
-+char (*f) () = remove;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2274: \"$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
-+int
-+main ()
-+{
-+return f != 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  :
--else
--  echo "$ac_t""no" 1>&6
-+ac_cv_func_remove=no
- fi
-+rm -f conftest.err 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
- 
-     if test $ac_cv_func_remove = no; then
--      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:2295: 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
-+      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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2303 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char remove();
--
--int main() {
--remove()
--; return 0; }
--EOF
--if { (eval echo configure:2314: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_posix_remove=no
-+fi
-+rm -f conftest.err 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
-   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 $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:2338: checking for shmat" >&5
--if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2343 "configure"
--#include "confdefs.h"
-+    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
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shmat innocuous_shmat
-+
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shmat(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char shmat();
-+    which can conflict with char shmat (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- 
--int main() {
-+#undef shmat
- 
-+/* 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 ();
- /* 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
--shmat();
-+char (*f) () = shmat;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2366: \"$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
-+int
-+main ()
-+{
-+return f != 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  :
--else
--  echo "$ac_t""no" 1>&6
-+ac_cv_func_shmat=no
- fi
-+rm -f conftest.err 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
- 
-     if test $ac_cv_func_shmat = no; then
--      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:2387: 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
-+      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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2395 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char shmat();
--
--int main() {
--shmat()
--; return 0; }
--EOF
--if { (eval echo configure:2406: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ipc_shmat=no
-+fi
-+rm -f conftest.err 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
-   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.
--  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
--  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:2439: 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
-+  # 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_save_LIBS="$LIBS"
--LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2447 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char IceConnectionNumber();
--
--int main() {
--IceConnectionNumber()
--; return 0; }
--EOF
--if { (eval echo configure:2458: \"$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"
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ICE_IceConnectionNumber=no
-+fi
-+rm -f conftest.err 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
-   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 "configure: error: Blackbox requires the X Window System libraries and headers." 1>&2; exit 1; }
-+test x$no_x = "xyes" && { { echo "$as_me:$LINENO: error: Blackbox requires the X Window System libraries and headers." >&5
-+echo "$as_me: error: Blackbox requires the X Window System libraries and headers." >&2;}
-+   { (exit 1); exit 1; }; }
- 
- test x$x_includes = "x" && x_includes="/usr/include"
- test x$x_libraries = "x" && x_libraries="/usr/lib"
-@@ -2489,71 +5776,107 @@
- LIBS="$LIBS $X_LIBS"
- LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
- 
--echo $ac_n "checking for GCC""... $ac_c" 1>&6
--echo "configure:2494: checking for GCC" >&5
-+echo "$as_me:$LINENO: checking for GCC" >&5
-+echo $ECHO_N "checking for GCC... $ECHO_C" >&6
- if test x$GCC = "xyes"; then
--  echo "$ac_t""yes" 1>&6
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-   CXXFLAGS="${CXXFLAGS} -Wall -W -pedantic"
- else
--  echo "$ac_t""no, trying other compilers" 1>&6
--  echo $ac_n "checking for MIPSpro""... $ac_c" 1>&6
--echo "configure:2501: checking for MIPSpro" >&5
-+  echo "$as_me:$LINENO: result: no, trying other compilers" >&5
-+echo "${ECHO_T}no, trying other compilers" >&6
-+  echo "$as_me:$LINENO: checking for MIPSpro" >&5
-+echo $ECHO_N "checking for MIPSpro... $ECHO_C" >&6
-   mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
-   if test "x$mips_pro_ver" = "x"; then
--    echo "$ac_t""no" 1>&6
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-   else
--    echo "$ac_t""yes, version $mips_pro_ver." 1>&6
--    echo $ac_n "checking for -LANG:std in CXXFLAGS""... $ac_c" 1>&6
--echo "configure:2508: checking for -LANG:std in CXXFLAGS" >&5
-+    echo "$as_me:$LINENO: result: yes, version $mips_pro_ver." >&5
-+echo "${ECHO_T}yes, version $mips_pro_ver." >&6
-+    echo "$as_me:$LINENO: checking for -LANG:std in CXXFLAGS" >&5
-+echo $ECHO_N "checking for -LANG:std in CXXFLAGS... $ECHO_C" >&6
-     lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
-     if test "x$lang_std_not_set" = "x"; then
--      echo "$ac_t""not set, setting." 1>&6
-+      echo "$as_me:$LINENO: result: not set, setting." >&5
-+echo "${ECHO_T}not set, setting." >&6
-       CXXFLAGS="${CXXFLAGS} -LANG:std"
-     else
--      echo "$ac_t""already set." 1>&6
-+      echo "$as_me:$LINENO: result: already set." >&5
-+echo "${ECHO_T}already set." >&6
-     fi
--  fi 
-+  fi
- fi
- 
--echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
--echo "configure:2520: 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
-+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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2528 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char XOpenDisplay();
--
--int main() {
--XOpenDisplay()
--; return 0; }
--EOF
--if { (eval echo configure:2539: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_X11_XOpenDisplay=no
-+fi
-+rm -f conftest.err 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
-   LIBS="$LIBS -lX11"
- else
--  echo "$ac_t""no" 1>&6
--{ echo "configure: error: Could not find XOpenDisplay in -lX11." 1>&2; exit 1; }
-+  { { 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; }; }
- 
- fi
- 
-@@ -2563,227 +5886,469 @@
- Xext_lib=""
- 
- SHAPE=""
--echo $ac_n "checking whether to build support for the XShape extension""... $ac_c" 1>&6
--echo "configure:2568: checking whether to build support for the XShape extension" >&5
-+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
- # 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 "$ac_t""yes" 1>&6
--  echo $ac_n "checking for XShapeCombineShape in -lXext""... $ac_c" 1>&6
--echo "configure:2580: 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
-+  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_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2588 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char XShapeCombineShape();
--
--int main() {
--XShapeCombineShape()
--; return 0; }
--EOF
--if { (eval echo configure:2599: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--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:2615: checking for X11/extensions/shape.h" >&5
--    cat > conftest.$ac_ext <<EOF
--#line 2617 "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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_Xext_XShapeCombineShape=no
-+fi
-+rm -f conftest.err 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
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/extensions/shape.h>
- 
--int main() {
-+int
-+main ()
-+{
- long foo = ShapeSet
--; return 0; }
--EOF
--if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  echo "$ac_t""yes" 1>&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-       SHAPE="-DSHAPE"; Xext_lib="-lXext"
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  echo "$ac_t""no" 1>&6
--    
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
- fi
--rm -f conftest*
--  
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+
-+LIBS="$LIBS $Xext_lib"
-+
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+
-+Xext_lib=""
-+
-+XINERAMA=""
-+echo "$as_me:$LINENO: checking whether to build support for the Xinerama extension" >&5
-+echo $ECHO_N "checking whether to build support for the Xinerama extension... $ECHO_C" >&6
-+# Check whether --enable-xinerama or --disable-xinerama was given.
-+if test "${enable_xinerama+set}" = set; then
-+  enableval="$enable_xinerama"
-+
-+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 XineramaQueryScreens in -lXinerama" >&5
-+echo $ECHO_N "checking for XineramaQueryScreens in -lXinerama... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXinerama  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 XineramaQueryScreens ();
-+int
-+main ()
-+{
-+XineramaQueryScreens ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_Xinerama_XineramaQueryScreens=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_Xinerama_XineramaQueryScreens=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6
-+if test $ac_cv_lib_Xinerama_XineramaQueryScreens = yes; then
-+  echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
-+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/extensions/Xinerama.h>
-+
-+int
-+main ()
-+{
-+XineramaScreenInfo* s = 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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+      XINERAMA="-DXINERAMA"; Xext_lib="-lXext -lXinerama"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+
- fi
- 
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
- 
- LIBS="$LIBS $Xext_lib"
- 
- ORDEREDPSEUDO=""
--echo $ac_n "checking whether to include Pseudocolor ordered dithering code""... $ac_c" 1>&6
--echo "configure:2653: checking whether to include Pseudocolor ordered dithering code" >&5
-+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
- # 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 "$ac_t""yes" 1>&6
--    ORDEREDPSEUDO="-DORDEREDPSEUDO" 
-+    echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+    ORDEREDPSEUDO="-DORDEREDPSEUDO"
-   else
--    echo "$ac_t""no" 1>&6 
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-   fi
- else
--  echo "$ac_t""no" 1>&6
--
--fi
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- 
-+fi;
- 
- 
- DEBUG=""
--echo $ac_n "checking whether to include verbose debugging code""... $ac_c" 1>&6
--echo "configure:2672: checking whether to include verbose debugging code" >&5
-+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
- # 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 "$ac_t""yes" 1>&6
-+    echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-     if test x$GCC = "xyes"; then
-        DEBUG="-DDEBUG -fno-inline -g"
-     else
-        DEBUG="-DDEBUG"
-     fi
-   else
--    echo "$ac_t""no" 1>&6
--    DEBUG="-DNDEBUG" 
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+    DEBUG="-DNDEBUG"
- fi
- else
--  echo "$ac_t""no" 1>&6
--  DEBUG="-DNDEBUG" 
--
--fi
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+  DEBUG="-DNDEBUG"
- 
-+fi;
- 
- 
- NLS=""
--echo $ac_n "checking whether to include NLS support""... $ac_c" 1>&6
--echo "configure:2697: checking whether to include NLS support" >&5
-+echo "$as_me:$LINENO: checking whether to include NLS support" >&5
-+echo $ECHO_N "checking whether to include NLS support... $ECHO_C" >&6
- # 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 "$ac_t""yes" 1>&6
-+    echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-     NLS="-DNLS"
-   else
--    echo "$ac_t""no" 1>&6
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-   fi
- else
--  echo "$ac_t""yes" 1>&6
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-   NLS="-DNLS"
- 
--fi
--
-+fi;
- 
- 
--echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6
--echo "configure:2716: 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
-+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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lxpg4  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2724 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char setlocale();
--
--int main() {
--setlocale()
--; return 0; }
--EOF
--if { (eval echo configure:2735: \"$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"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+/* 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 ();
-+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>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_xpg4_setlocale=no
-+fi
-+rm -f conftest.err 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
-   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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2761: 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
-+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
- else
-   if test -n "$gencat_cmd"; then
-   ac_cv_prog_gencat_cmd="$gencat_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_gencat_cmd="$ac_prog"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
-+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
-+
- fi
- fi
--gencat_cmd="$ac_cv_prog_gencat_cmd"
-+gencat_cmd=$ac_cv_prog_gencat_cmd
- if test -n "$gencat_cmd"; then
--  echo "$ac_t""$gencat_cmd" 1>&6
-+  echo "$as_me:$LINENO: result: $gencat_cmd" >&5
-+echo "${ECHO_T}$gencat_cmd" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--test -n "$gencat_cmd" && break
-+  test -n "$gencat_cmd" && break
- done
- 
- if test x$gencat_cmd = "x"; then
-@@ -2792,37 +6357,42 @@
- 
- 
- TIMEDCACHE=""
--echo $ac_n "checking whether to use the new timed pixmap cache""... $ac_c" 1>&6
--echo "configure:2797: checking whether to use the new timed pixmap cache" >&5
-+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
- # 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 "$ac_t""yes" 1>&6
-+    echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-     TIMEDCACHE="-DTIMEDCACHE"
-   else
--    echo "$ac_t""no" 1>&6
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-   fi
- else
--  echo "$ac_t""yes" 1>&6
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-   TIMEDCACHE="-DTIMEDCACHE"
- 
--fi
--
-+fi;
- 
- 
--echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:2816: checking return type of signal handlers" >&5
--if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2821 "configure"
--#include "confdefs.h"
-+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
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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);
-@@ -2830,41 +6400,65 @@
- void (*signal ()) ();
- #endif
- 
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (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); }; } &&
-+	 { 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_cv_type_signal=void
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_type_signal=int
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_signal=int
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
--echo "$ac_t""$ac_cv_type_signal" 1>&6
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
--EOF
-+_ACEOF
- 
- 
- 
--echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:2858: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+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
-     # 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
-+fi;
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
- 
--  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
--  
- 
- if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-@@ -2874,460 +6468,1332 @@
-   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"
- 
--trap '' 1 2 15
--cat > confcache <<\EOF
-+          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_AR/Makefile nls/es_ES/Makefile nls/fr_FR/Makefile nls/hu_HU/Makefile nls/it_IT/Makefile nls/ja_JP/Makefile nls/ko_KR/Makefile nls/lv_LV/Makefile nls/nl_NL/Makefile nls/no_NO/Makefile nls/pl_PL/Makefile nls/pt_BR/Makefile nls/ro_RO/Makefile nls/ru_RU/Makefile nls/sk_SK/Makefile nls/sl_SI/Makefile nls/sv_SE/Makefile nls/uk_UA/Makefile nls/zh_CN/Makefile nls/zh_TW/Makefile version.h"
-+cat >confcache <<\_ACEOF
- # 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.  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, 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.
- #
--# 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.
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
- #
--EOF
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
- # 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 \
--      -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
-+{
-+  (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 diff $cache_file confcache >/dev/null 2>&1; then :; else
-   if test -w $cache_file; then
--    echo "updating cache $cache_file"
--    cat confcache > $cache_file
-+    test "x$cache_file" != "x/dev/null" && 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}'
- 
--# 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.
-+# 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).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/;
-+s/:*\${srcdir}:*/:/;
-+s/:*@srcdir@:*/:/;
-+s/^\([^=]*=[	 ]*\):*/\1/;
-+s/:*$//;
-+s/^[^=]*=[	 ]*$//;
-+}'
- fi
- 
--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_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_i=`echo "$ac_i" |
-+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+  # 2. Add them.
-+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
- 
--echo creating $CONFIG_STATUS
--rm -f $CONFIG_STATUS
--cat > $CONFIG_STATUS <<EOF
--#! /bin/sh
--# Generated automatically by configure.
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${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.
--# This directory was configured as follows,
--# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--#
--# $0 $ac_configure_args
--#
- # Compiler output produced by configure, useful for debugging
--# configure, is in ./config.log if it exists.
-+# configure, is in config.log if it exists.
- 
--ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
--for ac_option
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=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=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+  set -o posix
-+fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$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" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.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
-+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+	     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
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval 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="eval 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
-+
-+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.59.  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
-+  -q, --quiet      do not print progress messages
-+  -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.59,
-+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2003 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 "\$ac_option" in
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  -*)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  *) # This is not an option, so the user has probably given explicit
-+     # arguments.
-+     ac_option=$1
-+     ac_need_defaults=false;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-   -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 ;;
-+    ac_cs_recheck=: ;;
-+  --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 )
-+    $ac_shift
-+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    ac_need_defaults=false;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # 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
- 
--ac_given_srcdir=$srcdir
--ac_given_INSTALL="$INSTALL"
-+ac_configure_extra_args=
- 
--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_AR/Makefile
--nls/es_ES/Makefile
--nls/fr_FR/Makefile
--nls/hu_HU/Makefile
--nls/it_IT/Makefile
--nls/ja_JP/Makefile
--nls/ko_KR/Makefile
--nls/lv_LV/Makefile
--nls/nl_NL/Makefile
--nls/no_NO/Makefile
--nls/pl_PL/Makefile
--nls/pt_BR/Makefile
--nls/ro_RO/Makefile
--nls/ru_RU/Makefile
--nls/sk_SK/Makefile
--nls/sl_SI/Makefile
--nls/sv_SE/Makefile
--nls/uk_UA/Makefile
--nls/zh_CN/Makefile
--nls/zh_TW/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%@CPP@%$CPP%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%@ORDEREDPSEUDO@%$ORDEREDPSEUDO%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
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+#
-+# INIT-COMMANDS section.
-+#
-+
-+
-+
-+_ACEOF
-+
-+
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_config_target in $ac_config_targets
-+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_AR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/es_AR/Makefile" ;;
-+  "nls/es_ES/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/es_ES/Makefile" ;;
-+  "nls/fr_FR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/fr_FR/Makefile" ;;
-+  "nls/hu_HU/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/hu_HU/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/ko_KR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/ko_KR/Makefile" ;;
-+  "nls/lv_LV/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/lv_LV/Makefile" ;;
-+  "nls/nl_NL/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/nl_NL/Makefile" ;;
-+  "nls/no_NO/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/no_NO/Makefile" ;;
-+  "nls/pl_PL/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/pl_PL/Makefile" ;;
-+  "nls/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/pt_BR/Makefile" ;;
-+  "nls/ro_RO/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/ro_RO/Makefile" ;;
-+  "nls/ru_RU/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/ru_RU/Makefile" ;;
-+  "nls/sk_SK/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/sk_SK/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/uk_UA/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/uk_UA/Makefile" ;;
-+  "nls/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/zh_CN/Makefile" ;;
-+  "nls/zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/zh_TW/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; }; };;
-+  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
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# 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.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./confstat$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in ." >&2
-+   { (exit 1); exit 1; }
-+}
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+
-+#
-+# CONFIG_FILES section.
-+#
- 
-+# 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,@EGREP@,$EGREP,;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,@XINERAMA@,$XINERAMA,;t t
-+s,@ORDEREDPSEUDO@,$ORDEREDPSEUDO,;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
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
--EOF
- 
--cat >> $CONFIG_STATUS <<\EOF
-+_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_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"
-+  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
-     else
--      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+      # 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`
-     fi
--    ac_file=`expr $ac_file + 1`
--    ac_beg=$ac_end
--    ac_end=`expr $ac_end + $ac_max_sed_cmds`
--  fi
--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_AR/Makefile
--nls/es_ES/Makefile
--nls/fr_FR/Makefile
--nls/hu_HU/Makefile
--nls/it_IT/Makefile
--nls/ja_JP/Makefile
--nls/ko_KR/Makefile
--nls/lv_LV/Makefile
--nls/nl_NL/Makefile
--nls/no_NO/Makefile
--nls/pl_PL/Makefile
--nls/pt_BR/Makefile
--nls/ro_RO/Makefile
--nls/ru_RU/Makefile
--nls/sk_SK/Makefile
--nls/sl_SI/Makefile
--nls/sv_SE/Makefile
--nls/uk_UA/Makefile
--nls/zh_CN/Makefile
--nls/zh_TW/Makefile
--version.h"}
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+  done
-+  if test -z "$ac_sed_cmds"; then
-+    ac_sed_cmds=cat
-+  fi
-+fi # test -n "$CONFIG_FILES"
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.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" ;;
-+  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
- 
--  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
--
--  # 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 "$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" ;;
-+  # 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'`
-+  { if $as_mkdir_p; then
-+    mkdir -p "$ac_dir"
-+  else
-+    as_dir="$ac_dir"
-+    as_dirs=
-+    while test ! -d "$as_dir"; do
-+      as_dirs="$as_dir $as_dirs"
-+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    done
-+    test ! -n "$as_dirs" || mkdir $as_dirs
-+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+  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.
--    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
--    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
-+
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
-+  # 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."
- 
--  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
-+  # 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; }
-+
-+  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
-+_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
-+
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
--  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*
-+#
-+# CONFIG_HEADER section.
-+#
- 
- # 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='\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_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_uC=' '
--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
-+ac_uD=',;t'
-+
-+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.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" ;;
-+  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
- 
--  echo creating $ac_file
-+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
- 
--  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
-+  # 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; }; }
-+	 # Do quote $f, to prevent DOS paths from being IFS'd.
-+	 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
- 
- # 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.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.
--
-+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 grep "^[	 ]*#[	 ]*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 :
-+while grep . conftest.defines >/dev/null
- do
--  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
-+  # 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 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.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
--    # 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
--    rm -f $ac_file
--    mv conftest.h $ac_file
-+  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 # grep' >>$CONFIG_STATUS
-+echo >>$CONFIG_STATUS
-+
-+# 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
-+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
-+  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
-+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
-+  else
-+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-   fi
--fi; done
-+  cat $tmp/in >>$tmp/config.h
-+  rm -f $tmp/in
-+  if test x"$ac_file" != x-; then
-+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; 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'`
-+      { if $as_mkdir_p; then
-+    mkdir -p "$ac_dir"
-+  else
-+    as_dir="$ac_dir"
-+    as_dirs=
-+    while test ! -d "$as_dir"; do
-+      as_dirs="$as_dir $as_dirs"
-+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    done
-+    test ! -n "$as_dirs" || mkdir $as_dirs
-+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }; }
- 
--EOF
--cat >> $CONFIG_STATUS <<EOF
-+      rm -f $ac_file
-+      mv $tmp/config.h $ac_file
-+    fi
-+  else
-+    cat $tmp/config.h
-+    rm -f $tmp/config.h
-+  fi
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
-+#
-+# 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'`
-+  { if $as_mkdir_p; then
-+    mkdir -p "$ac_dir"
-+  else
-+    as_dir="$ac_dir"
-+    as_dirs=
-+    while test ! -d "$as_dir"; do
-+      as_dirs="$as_dir $as_dirs"
-+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+    done
-+    test ! -n "$as_dirs" || mkdir $as_dirs
-+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+  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
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+  case "$ac_dir" in
-+  .) ac_abs_builddir=`pwd`;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+  case ${ac_top_builddir}. in
-+  .) ac_abs_top_builddir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+  case $ac_srcdir in
-+  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+  case $ac_top_srcdir in
-+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  esac;;
-+esac
-+
-+
-+  { 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
--test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
--exit 0
--EOF
-+{ (exit 0); exit 0; }
-+_ACEOF
- chmod +x $CONFIG_STATUS
--rm -fr confdefs* $ac_clean_files
--test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+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=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || 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
- 
---- blackbox-0.65.0.orig/configure.in
-+++ blackbox-0.65.0/configure.in
-@@ -106,6 +106,38 @@
- 
- LIBS="$LIBS $Xext_lib"
- 
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+
-+Xext_lib=""
-+
-+dnl Check for Xinerama extension support and proper library files.
-+XINERAMA=""
-+AC_MSG_CHECKING([whether to build support for the Xinerama extension])
-+AC_ARG_ENABLE(
-+  xinerama, [  --enable-xinerama      enable support of the xinerama extension [default=yes]])
-+
-+: ${enableval="yes"}
-+if test x$enableval = "xyes"; then
-+  AC_MSG_RESULT([yes])
-+  AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
-+    AC_MSG_CHECKING([for X11/extensions/Xinerama.h])
-+    AC_TRY_LINK(
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/extensions/Xinerama.h>
-+, XineramaScreenInfo* s = 0,
-+      AC_MSG_RESULT([yes])
-+      XINERAMA="-DXINERAMA"; Xext_lib="-lXext -lXinerama",
-+      AC_MSG_RESULT([no])
-+    )
-+  )
-+else
-+  AC_MSG_RESULT([no])
-+fi
-+AC_SUBST(XINERAMA)
-+
-+LIBS="$LIBS $Xext_lib"
-+
- dnl Check for ordered 8bpp dithering
- ORDEREDPSEUDO=""
- AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
---- blackbox-0.65.0.orig/doc/blackbox.1.in
-+++ blackbox-0.65.0/doc/blackbox.1.in
-@@ -786,6 +786,13 @@
- .EX
- .B Default is False.
- .EE
-+.TP 3
-+.BI "session.screen<num>.slit.xineramaPlacement" "  [True|False]"
-+Determines whether Xinerama inforation should be used to
-+avoid placing the slit in non-viewable regions of the display.
-+.EX
-+.B Default is True.
-+.EE
- .\"
- .\" ***** MENU CONFIGURABLE FROM MAIN MENU *****
- .\"
-@@ -845,6 +852,24 @@
- .B Default is TopToBottom.
- .EE
- .TP 3
-+.BI "session.screen<num>.xineramaPlacement" "  [True|False]"
-+Use Xinerama information when deciding where to place windows.
-+.EX
-+.B Default is True.
-+.EE
-+.TP 3
-+.BI "session.screen<num>.xineramaMenus" "  [True|False]"
-+Use Xinerama information to avoid menus spanning screen boundaries.
-+.EX
-+.B Default is True.
-+.EE
-+.TP 3
-+.BI "session.screen<num>.xineramaMaximize" "  [True|False]"
-+Maximize windows to fill one screen when Xineramam is in use.
-+.EX
-+.B Default is True.
-+.EE
-+.TP 3
- .BI "session.imageDither" "  [True|False]" 
- This setting is only used when running in low 
- color modes. Image Dithering helps to show an
-@@ -951,6 +976,19 @@
- .EX
- .B Default is False.
- .EE
-+.TP 3
-+.BI "session.screen<num>.toolbar.xineramaPlacement" "  [True|False]"
-+Use Xinerama information to prevent toolbar from being split
-+across screens.
-+.EX
-+.B Default is True.
-+.EE
-+.TP 3
-+.BI "session.screen<num>.toolbar.xineramaScreen" "  [integer]"
-+Xinerama screen number in which to place the toolbar.
-+.EX
-+.B Default is -1 (auto).
-+.EE
- .\"
- .\" ***** CONFIGURABLE IN BLACKBOXRC ONLY *****
- .\"
---- blackbox-0.65.0.orig/nls/C/Configmenu.m
-+++ blackbox-0.65.0/nls/C/Configmenu.m
-@@ -40,3 +40,13 @@
- # Top to Bottom
- $ #BottomTop
- # Bottom to Top
-+$ #XineramaOptions
-+# Xinerama Options
-+$ #XineramaPlacement
-+# Window Placement
-+$ #XineramaMaximize
-+# Window Maximizing
-+$ #XineramaToolbar
-+# Toolbar Placement
-+$ #XineramaMenus
-+# Menu Placement
---- blackbox-0.65.0.orig/nls/C/Toolbar.m
-+++ blackbox-0.65.0/nls/C/Toolbar.m
-@@ -20,3 +20,7 @@
- # Edit current workspace name
- $ #ToolbarPlacement
- # Toolbar Placement
-+$ #ScreenTop
-+# Screen %d Top
-+$ #ScreenBottom
-+# Screen %d Bottom
---- blackbox-0.65.0.orig/nls/convert.awk
-+++ blackbox-0.65.0/nls/convert.awk
-@@ -4,6 +4,8 @@
- 
-   if (major > 1)
-     printf "\n" > output
-+  else if (codeset)
-+    printf "$ codeset=%s\n", codeset > output
-   printf "$set %d %s\n", major, $3 > output
- 
-   if (header) {
---- blackbox-0.65.0.orig/nls/da_DK/Makefile.am
-+++ blackbox-0.65.0/nls/da_DK/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/da_DK/Makefile.in
-+++ blackbox-0.65.0/nls/da_DK/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/de_DE/Makefile.am
-+++ blackbox-0.65.0/nls/de_DE/Makefile.am
-@@ -26,7 +26,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/de_DE/Makefile.in
-+++ blackbox-0.65.0/nls/de_DE/Makefile.in
-@@ -200,7 +200,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/es_ES/Makefile.am
-+++ blackbox-0.65.0/nls/es_ES/Makefile.am
-@@ -28,7 +28,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/es_ES/Makefile.in
-+++ blackbox-0.65.0/nls/es_ES/Makefile.in
-@@ -202,7 +202,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/fr_FR/Makefile.am
-+++ blackbox-0.65.0/nls/fr_FR/Makefile.am
-@@ -26,7 +26,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/fr_FR/Makefile.in
-+++ blackbox-0.65.0/nls/fr_FR/Makefile.in
-@@ -200,7 +200,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/hu_HU/Makefile.am
-+++ blackbox-0.65.0/nls/hu_HU/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/hu_HU/Makefile.in
-+++ blackbox-0.65.0/nls/hu_HU/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/it_IT/Makefile.am
-+++ blackbox-0.65.0/nls/it_IT/Makefile.am
-@@ -26,7 +26,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/it_IT/Makefile.in
-+++ blackbox-0.65.0/nls/it_IT/Makefile.in
-@@ -200,7 +200,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/ja_JP/Makefile.am
-+++ blackbox-0.65.0/nls/ja_JP/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=eucJP output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/ja_JP/Makefile.in
-+++ blackbox-0.65.0/nls/ja_JP/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=eucJP output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/ko_KR/Makefile.am
-+++ blackbox-0.65.0/nls/ko_KR/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=eucKR output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/ko_KR/Makefile.in
-+++ blackbox-0.65.0/nls/ko_KR/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=eucKR output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/nl_NL/Makefile.am
-+++ blackbox-0.65.0/nls/nl_NL/Makefile.am
-@@ -26,7 +26,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/nl_NL/Makefile.in
-+++ blackbox-0.65.0/nls/nl_NL/Makefile.in
-@@ -200,7 +200,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/no_NO/Makefile.am
-+++ blackbox-0.65.0/nls/no_NO/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/no_NO/Makefile.in
-+++ blackbox-0.65.0/nls/no_NO/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/pt_BR/Makefile.am
-+++ blackbox-0.65.0/nls/pt_BR/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/pt_BR/Makefile.in
-+++ blackbox-0.65.0/nls/pt_BR/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/ru_RU/Makefile.am
-+++ blackbox-0.65.0/nls/ru_RU/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=KOI8-R output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/ru_RU/Makefile.in
-+++ blackbox-0.65.0/nls/ru_RU/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=KOI8-R output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/sl_SI/Makefile.am
-+++ blackbox-0.65.0/nls/sl_SI/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/sl_SI/Makefile.in
-+++ blackbox-0.65.0/nls/sl_SI/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/sv_SE/Makefile.am
-+++ blackbox-0.65.0/nls/sv_SE/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/sv_SE/Makefile.in
-+++ blackbox-0.65.0/nls/sv_SE/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/uk_UA/Makefile.am
-+++ blackbox-0.65.0/nls/uk_UA/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=KOI8-U output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/uk_UA/Makefile.in
-+++ blackbox-0.65.0/nls/uk_UA/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=KOI8-U output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/zh_CN/Makefile.am
-+++ blackbox-0.65.0/nls/zh_CN/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=GB2312 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/zh_CN/Makefile.in
-+++ blackbox-0.65.0/nls/zh_CN/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=GB2312 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/zh_TW/Makefile.am
-+++ blackbox-0.65.0/nls/zh_TW/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=BIG5 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/zh_TW/Makefile.in
-+++ blackbox-0.65.0/nls/zh_TW/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=BIG5 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/es_AR/Makefile.am
-+++ blackbox-0.65.0/nls/es_AR/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/es_AR/Makefile.in
-+++ blackbox-0.65.0/nls/es_AR/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-1 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/pl_PL/Makefile.in
-+++ blackbox-0.65.0/nls/pl_PL/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/pl_PL/Makefile.am
-+++ blackbox-0.65.0/nls/pl_PL/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/sk_SK/Makefile.am
-+++ blackbox-0.65.0/nls/sk_SK/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk convert=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/sk_SK/Makefile.in
-+++ blackbox-0.65.0/nls/sk_SK/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-2 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/lv_LV/Makefile.am
-+++ blackbox-0.65.0/nls/lv_LV/Makefile.am
-@@ -23,7 +23,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-13 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/nls/lv_LV/Makefile.in
-+++ blackbox-0.65.0/nls/lv_LV/Makefile.in
-@@ -197,7 +197,7 @@
- 
- Translation.m: $(MFILES)
- 	@if test x$(NLSTEST) = "x-DNLS"; then \
--		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-+		awk -f @srcdir@/../convert.awk codeset=ISO-8859-13 output=Translation.m $(MFILES); \
- 	fi
- 
- blackbox.cat: Translation.m
---- blackbox-0.65.0.orig/src/BaseDisplay.cc
-+++ blackbox-0.65.0/src/BaseDisplay.cc
-@@ -86,6 +86,7 @@
- #include "GCCache.hh"
- #include "Timer.hh"
- #include "Util.hh"
-+#include "Xinerama.hh"
- 
- 
- // X error handler to handle any and all X errors while the application is
-@@ -400,9 +401,8 @@
- }
- 
- 
--ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) {
--  basedisplay = d;
--  screen_number = num;
-+ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num)
-+  : basedisplay(d), screen_number(num), xinerama_info(0) {
- 
-   root_window = RootWindow(basedisplay->getXDisplay(), screen_number);
- 
-@@ -465,4 +465,12 @@
- 
-   display_string = string("DISPLAY=") + default_string + '.' +
-     itostring(static_cast<unsigned long>(screen_number));
-+    
-+#ifdef  XINERAMA
-+  xinerama_info = new XineramaInfo(this);
-+  if (! xinerama_info->haveXinerama()) {
-+    delete xinerama_info;
-+    xinerama_info = 0;
-+  }
-+#endif
- }
---- blackbox-0.65.0.orig/src/BaseDisplay.hh
-+++ blackbox-0.65.0/src/BaseDisplay.hh
-@@ -35,6 +35,7 @@
- // forward declaration
- class BaseDisplay;
- class BGCCache;
-+class XineramaInfo;
- 
- #include "Timer.hh"
- #include "Util.hh"
-@@ -51,11 +52,14 @@
-   std::string display_string;
-   Rect rect;
- 
-+  XineramaInfo* xinerama_info;
-+  
- public:
-   ScreenInfo(BaseDisplay *d, unsigned int num);
- 
-   inline BaseDisplay *getBaseDisplay(void) const { return basedisplay; }
-   inline Visual *getVisual(void) const { return visual; }
-+  inline XineramaInfo *getXineramaInfo(void) const { return xinerama_info; }
-   inline Window getRootWindow(void) const { return root_window; }
-   inline Colormap getColormap(void) const { return colormap; }
-   inline int getDepth(void) const { return depth; }
---- blackbox-0.65.0.orig/src/Basemenu.cc
-+++ blackbox-0.65.0/src/Basemenu.cc
-@@ -49,6 +49,7 @@
- #include "Image.hh"
- #include "Screen.hh"
- #include "Util.hh"
-+#include "Xinerama.hh"
- 
- using std::string;
- using std::min;
-@@ -478,6 +479,29 @@
-     drawSubmenu(which_sub);
- }
- 
-+void Basemenu::moveInScreen(int screen_x, int screen_y, int dx, int dy) {
-+  int x = screen_x + dx;
-+  int y = screen_y + dy;
-+  
-+  Rect rect = screen->getRect();
-+  if (screen->getXineramaInfo() && screen->doXineramaMenus()) {
-+    XineramaScreen xinerama = screen->getXineramaInfo()->
-+      screenContaining(screen_x, screen_y);
-+    if (xinerama.isValid()) {
-+      rect = xinerama.getRect();
-+    }
-+  }
-+  
-+  if (x < rect.left()) x = rect.left();
-+  if (y < rect.top()) y = rect.top();
-+  
-+  if (x + static_cast<signed>(getWidth()) > rect.right()) 
-+    x = rect.right() - getWidth() - screen->getBorderWidth(); 
-+  if (y + static_cast<signed>(getHeight()) > rect.bottom())
-+    y = rect.bottom() - getHeight() - screen->getBorderWidth();
-+  
-+  move(x,y);
-+}
- 
- void Basemenu::redrawTitle(void) {
-   const char *text = (! menu.label.empty()) ? getLabel() :
-@@ -559,16 +583,24 @@
-       y = (((shifted) ? menu.y_shift : menu.y) +
-            menu.height - submenu->menu.height);
- 
--    if ((x + submenu->getWidth()) > screen->getWidth())
-+    Rect rect = screen->getRect();
-+    if (screen->getXineramaInfo() && screen->doXineramaMenus()) {
-+      XineramaScreen scr = 
-+        screen->getXineramaInfo()->screenContaining(menu.x, menu.y);
-+      if (scr.isValid())
-+        rect = scr.getRect();
-+    }
-+    
-+    if ((x + static_cast<signed>(submenu->getWidth())) > rect.right())
-       x = ((shifted) ? menu.x_shift : menu.x) -
-         submenu->getWidth() - screen->getBorderWidth();
- 
--    if (x < 0) x = 0;
-+    if (x < rect.left()) x = rect.left();
- 
--    if ((y + submenu->getHeight()) > screen->getHeight())
--      y = screen->getHeight() - submenu->getHeight() -
-+    if ((y + static_cast<signed>(submenu->getHeight())) > rect.bottom())
-+      y = rect.bottom() - submenu->getHeight() -
-         (screen->getBorderWidth() * 2);
--    if (y < 0) y = 0;
-+    if (y < rect.top()) y = rect.top();
- 
-     submenu->move(x, y);
-     if (! moving) drawItem(index, True);
-@@ -961,22 +993,32 @@
- 
- void Basemenu::enterNotifyEvent(XCrossingEvent *ce) {
-   if (ce->window == menu.frame) {
-+
-+    Rect rect = screen->getRect();
-+#if 0
-+    if (screen->getXineramaInfo() && screen->doXineramaMenus()) {
-+      XineramaScreen xin_scr = 
-+        screen->getXineramaInfo()->screenContaining(menu.x, menu.y);
-+      if (xin_scr.isValid()) {
-+        rect = xin_scr.getRect();
-+      }
-+    }
-+#endif
-+
-     menu.x_shift = menu.x, menu.y_shift = menu.y;
--    if (menu.x + menu.width > screen->getWidth()) {
--      menu.x_shift = screen->getWidth() - menu.width -
--        screen->getBorderWidth();
-+    if (menu.x + static_cast<signed>(menu.width) > rect.right()) {
-+      menu.x_shift = rect.right() - menu.width - screen->getBorderWidth();
-       shifted = True;
--    } else if (menu.x < 0) {
--      menu.x_shift = -screen->getBorderWidth();
-+    } else if (menu.x < rect.left()) {
-+      menu.x_shift = rect.left() - screen->getBorderWidth();
-       shifted = True;
-     }
- 
--    if (menu.y + menu.height > screen->getHeight()) {
--      menu.y_shift = screen->getHeight() - menu.height -
--        screen->getBorderWidth();
-+    if (menu.y + static_cast<signed>(menu.height) > rect.bottom()) {
-+      menu.y_shift = rect.bottom() - menu.height - screen->getBorderWidth();
-       shifted = True;
--    } else if (menu.y + static_cast<signed>(menu.title_h) < 0) {
--      menu.y_shift = -screen->getBorderWidth();
-+    } else if (menu.y + static_cast<signed>(menu.title_h) < rect.top()) {
-+      menu.y_shift = rect.top() - screen->getBorderWidth();
-       shifted = True;
-     }
- 
---- blackbox-0.65.0.orig/src/Basemenu.hh
-+++ blackbox-0.65.0/src/Basemenu.hh
-@@ -129,6 +129,7 @@
-   void reconfigure(void);
-   void setLabel(const std::string& label);
-   void move(int x, int y);
-+  void moveInScreen(int screen_x, int screen_y, int dx = 0, int dy = 0);
-   void update(void);
-   void setItemSelected(int index, bool sel);
-   void setItemEnabled(int index, bool enable);
---- blackbox-0.65.0.orig/src/Configmenu.cc
-+++ blackbox-0.65.0/src/Configmenu.cc
-@@ -36,13 +36,21 @@
-   setLabel(i18n(ConfigmenuSet, ConfigmenuConfigOptions, "Config options"));
-   setInternalMenu();
- 
-+  int position = 2;
-   focusmenu = new Focusmenu(this);
-   placementmenu = new Placementmenu(this);
-+  xineramamenu = 0;
- 
-   insert(i18n(ConfigmenuSet, ConfigmenuFocusModel,
-               "Focus Model"), focusmenu);
-   insert(i18n(ConfigmenuSet, ConfigmenuWindowPlacement,
-               "Window Placement"), placementmenu);
-+  if (scr->getXineramaInfo()) {
-+    xineramamenu = new XineramaMenu(this);
-+    insert(i18n(ConfigmenuSet, ConfigmenuXineramaOptions,
-+                "Xinerama Options"), xineramamenu);
-+    position++;
-+  }
-   insert(i18n(ConfigmenuSet, ConfigmenuImageDithering,
-               "Image Dithering"), 1);
-   insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove,
-@@ -57,18 +65,19 @@
-               "Disable Bindings with Scroll Lock"), 6);
-   update();
- 
--  setItemSelected(2, getScreen()->getImageControl()->doDither());
--  setItemSelected(3, getScreen()->doOpaqueMove());
--  setItemSelected(4, getScreen()->doFullMax());
--  setItemSelected(5, getScreen()->doFocusNew());
--  setItemSelected(6, getScreen()->doFocusLast());
--  setItemSelected(7, getScreen()->allowScrollLock());
-+  setItemSelected(position++, getScreen()->getImageControl()->doDither());
-+  setItemSelected(position++, getScreen()->doOpaqueMove());
-+  setItemSelected(position++, getScreen()->doFullMax());
-+  setItemSelected(position++, getScreen()->doFocusNew());
-+  setItemSelected(position++, getScreen()->doFocusLast());
-+  setItemSelected(position++, getScreen()->allowScrollLock());
- }
- 
- 
- Configmenu::~Configmenu(void) {
-   delete focusmenu;
-   delete placementmenu;
-+  delete xineramamenu;
- }
- 
- 
-@@ -132,7 +141,8 @@
- void Configmenu::reconfigure(void) {
-   focusmenu->reconfigure();
-   placementmenu->reconfigure();
--
-+  if (xineramamenu)
-+    xineramamenu->reconfigure();
-   Basemenu::reconfigure();
- }
- 
-@@ -319,3 +329,59 @@
- 
-   reconfigure();
- }
-+
-+
-+Configmenu::XineramaMenu::XineramaMenu(Configmenu* cm) 
-+  : Basemenu(cm->getScreen()) {
-+  setLabel(i18n(ConfigmenuSet, ConfigmenuXineramaOptions, "Xinerama Options"));
-+  setInternalMenu();
-+  
-+  insert(i18n(ConfigmenuSet, ConfigmenuXineramaPlacement, "Window Placement"),
-+         ConfigmenuXineramaPlacement);
-+  insert(i18n(ConfigmenuSet, ConfigmenuXineramaMaximize, "Window Maximizing"),
-+         ConfigmenuXineramaMaximize);
-+  insert(i18n(ConfigmenuSet, ConfigmenuXineramaToolbar, "Toolbar Placement"),
-+         ConfigmenuXineramaToolbar);
-+  insert(i18n(ConfigmenuSet, ConfigmenuXineramaMenus, "Menu Placement"),
-+         ConfigmenuXineramaMenus);
-+  update();
-+  
-+  setItemSelected(0, getScreen()->doXineramaPlacement());
-+  setItemSelected(1, getScreen()->doXineramaMaximize());
-+  setItemSelected(2, getScreen()->doXineramaToolbar());
-+  setItemSelected(3, getScreen()->doXineramaMenus());
-+}
-+
-+
-+void Configmenu::XineramaMenu::itemSelected(int button, unsigned int index) {
-+  if (button != 1)
-+    return;
-+  
-+  switch (find(index)->function()) {
-+
-+    case ConfigmenuXineramaPlacement : {
-+      getScreen()->saveXineramaPlacement(! getScreen()->doXineramaPlacement());
-+      setItemSelected(index, getScreen()->doXineramaPlacement());
-+      break;
-+    }
-+    
-+    case ConfigmenuXineramaMaximize : {
-+      getScreen()->saveXineramaMaximize(! getScreen()->doXineramaMaximize());
-+      setItemSelected(index, getScreen()->doXineramaMaximize());
-+      break;
-+    }
-+    
-+    case ConfigmenuXineramaToolbar : {
-+      getScreen()->saveXineramaToolbar(! getScreen()->doXineramaToolbar());
-+      setItemSelected(index, getScreen()->doXineramaToolbar());
-+      getScreen()->getToolbar()->reconfigure();
-+      break;
-+    }
-+    
-+    case ConfigmenuXineramaMenus : {
-+      getScreen()->saveXineramaMenus(! getScreen()->doXineramaMenus());
-+      setItemSelected(index, getScreen()->doXineramaMenus());
-+      break;
-+    }
-+  }
-+}
---- blackbox-0.65.0.orig/src/Configmenu.hh
-+++ blackbox-0.65.0/src/Configmenu.hh
-@@ -58,8 +58,21 @@
-     virtual void reconfigure(void);
-   };
- 
-+  class XineramaMenu : public Basemenu {
-+  private:
-+    XineramaMenu(const XineramaMenu&);
-+    XineramaMenu& operator=(const XineramaMenu&);
-+
-+  protected:
-+    virtual void itemSelected(int button, unsigned int index);
-+
-+  public:
-+    XineramaMenu(Configmenu *cm);
-+  };
-+
-   Focusmenu *focusmenu;
-   Placementmenu *placementmenu;
-+  XineramaMenu* xineramamenu;
- 
-   friend class Focusmenu;
-   friend class Placementmenu;
-@@ -76,6 +89,7 @@
- 
-   inline Basemenu *getFocusmenu(void) { return focusmenu; }
-   inline Basemenu *getPlacementmenu(void) { return placementmenu; }
-+  inline Basemenu *getXineramamenu(void) { return xineramamenu; }
- 
-   void reconfigure(void);
- };
---- blackbox-0.65.0.orig/src/Makefile.in
-+++ blackbox-0.65.0/src/Makefile.in
-@@ -87,6 +87,7 @@
- ORDEREDPSEUDO = @ORDEREDPSEUDO@
- PACKAGE = @PACKAGE@
- SHAPE = @SHAPE@
-+XINERAMA = @XINERAMA@
- TIMEDCACHE = @TIMEDCACHE@
- VERSION = @VERSION@
- gencat_cmd = @gencat_cmd@
-@@ -95,7 +96,7 @@
- DEFAULT_MENU = $(pkgdatadir)/menu
- DEFAULT_STYLE = $(pkgdatadir)/styles/Results
- 
--CPPFLAGS = @CPPFLAGS@ @SHAPE@ @ORDEREDPSEUDO@ @DEBUG@ @NLS@ @TIMEDCACHE@ -DLOCALEPATH=\"$(pkgdatadir)/nls\" -DDEFAULTMENU=\"$(DEFAULT_MENU)\" -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
-+CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XINERAMA@ @ORDEREDPSEUDO@ @DEBUG@ @NLS@ @TIMEDCACHE@ -DLOCALEPATH=\"$(pkgdatadir)/nls\" -DDEFAULTMENU=\"$(DEFAULT_MENU)\" -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
- 
- 
- bin_PROGRAMS = blackbox
-@@ -119,7 +120,8 @@
- blackbox_OBJECTS =  BaseDisplay.o Basemenu.o Clientmenu.o Color.o \
- Configmenu.o GCCache.o Iconmenu.o Image.o ImageControl.o Netizen.o \
- Rootmenu.o Screen.o Slit.o Texture.o Timer.o Toolbar.o Util.o Window.o \
--Windowmenu.o Workspace.o Workspacemenu.o blackbox.o i18n.o main.o
-+Windowmenu.o Workspace.o Workspacemenu.o Xinerama.o \
-+blackbox.o i18n.o main.o
- blackbox_LDADD = $(LDADD)
- blackbox_DEPENDENCIES = 
- blackbox_LDFLAGS = 
-@@ -321,11 +323,11 @@
- 
- BaseDisplay.o: BaseDisplay.cc ../config.h i18n.hh \
-  ../nls/blackbox-nls.hh BaseDisplay.hh Timer.hh GCCache.hh Color.hh \
-- Util.hh
-+ Util.hh Xinerama.hh
- Basemenu.o: Basemenu.cc ../config.h i18n.hh ../nls/blackbox-nls.hh \
-  blackbox.hh BaseDisplay.hh Timer.hh Basemenu.hh GCCache.hh Color.hh \
-  Image.hh Screen.hh Texture.hh Util.hh Configmenu.hh Iconmenu.hh \
-- Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh
-+ Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Xinerama.hh
- Clientmenu.o: Clientmenu.cc ../config.h blackbox.hh i18n.hh \
-  ../nls/blackbox-nls.hh BaseDisplay.hh Timer.hh Clientmenu.hh \
-  Basemenu.hh Screen.hh Color.hh Texture.hh Util.hh Configmenu.hh \
-@@ -375,13 +377,13 @@
-  blackbox.hh BaseDisplay.hh Timer.hh Clientmenu.hh Basemenu.hh \
-  GCCache.hh Color.hh Iconmenu.hh Image.hh Rootmenu.hh Screen.hh \
-  Texture.hh Util.hh Configmenu.hh Netizen.hh Workspace.hh \
-- Workspacemenu.hh Toolbar.hh Window.hh Windowmenu.hh Slit.hh
-+ Workspacemenu.hh Toolbar.hh Window.hh Windowmenu.hh Slit.hh Xinerama.hh
- Util.o: Util.cc ../config.h Util.hh
- Window.o: Window.cc ../config.h i18n.hh ../nls/blackbox-nls.hh \
-  blackbox.hh BaseDisplay.hh Timer.hh GCCache.hh Color.hh Iconmenu.hh \
-  Basemenu.hh Image.hh Screen.hh Texture.hh Util.hh Configmenu.hh \
-  Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Toolbar.hh \
-- Window.hh Windowmenu.hh Slit.hh
-+ Window.hh Windowmenu.hh Slit.hh Xinerama.hh
- Windowmenu.o: Windowmenu.cc ../config.h i18n.hh ../nls/blackbox-nls.hh \
-  blackbox.hh BaseDisplay.hh Timer.hh Screen.hh Color.hh Texture.hh \
-  Util.hh Configmenu.hh Basemenu.hh Iconmenu.hh Netizen.hh Rootmenu.hh \
-@@ -390,11 +392,12 @@
-  blackbox.hh BaseDisplay.hh Timer.hh Clientmenu.hh Basemenu.hh \
-  Netizen.hh Screen.hh Color.hh Texture.hh Util.hh Configmenu.hh \
-  Iconmenu.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Toolbar.hh \
-- Window.hh Windowmenu.hh
-+ Window.hh Windowmenu.hh Xinerama.hh
- Workspacemenu.o: Workspacemenu.cc ../config.h i18n.hh \
-  ../nls/blackbox-nls.hh blackbox.hh BaseDisplay.hh Timer.hh Screen.hh \
-  Color.hh Texture.hh Util.hh Configmenu.hh Basemenu.hh Iconmenu.hh \
-  Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Toolbar.hh
-+Xinerama.o: Xinerama.cc ../config.h Util.hh Xinerama.hh
- blackbox.o: blackbox.cc ../config.h i18n.hh ../nls/blackbox-nls.hh \
-  blackbox.hh BaseDisplay.hh Timer.hh Basemenu.hh Clientmenu.hh \
-  GCCache.hh Color.hh Image.hh Rootmenu.hh Screen.hh Texture.hh Util.hh \
---- blackbox-0.65.0.orig/src/Screen.cc
-+++ blackbox-0.65.0/src/Screen.cc
-@@ -998,6 +998,9 @@
- 
-   *(session_stack + i++) = configmenu->getFocusmenu()->getWindowID();
-   *(session_stack + i++) = configmenu->getPlacementmenu()->getWindowID();
-+  if (configmenu->getXineramamenu())
-+    *(session_stack + i++) = configmenu->getXineramamenu()->getWindowID();
-+    
-   *(session_stack + i++) = configmenu->getWindowID();
- 
-   *(session_stack + i++) = slit->getMenu()->getDirectionmenu()->getWindowID();
-@@ -1704,38 +1707,18 @@
-     if (rootmenu->isVisible())
-       rootmenu->hide();
-   } else if (xbutton->button == 2) {
--    int mx = xbutton->x_root - (workspacemenu->getWidth() / 2);
--    int my = xbutton->y_root - (workspacemenu->getTitleHeight() / 2);
--
--    if (mx < 0) mx = 0;
--    if (my < 0) my = 0;
--
--    if (mx + workspacemenu->getWidth() > getWidth())
--      mx = getWidth() - workspacemenu->getWidth() - getBorderWidth();
--
--    if (my + workspacemenu->getHeight() > getHeight())
--      my = getHeight() - workspacemenu->getHeight() - getBorderWidth();
--
--    workspacemenu->move(mx, my);
-+    workspacemenu->moveInScreen(xbutton->x_root, xbutton->y_root,
-+               -static_cast<signed>(workspacemenu->getWidth()) / 2,
-+               -static_cast<signed>(workspacemenu->getTitleHeight()) / 2);
- 
-     if (! workspacemenu->isVisible()) {
-       workspacemenu->removeParent();
-       workspacemenu->show();
-     }
-   } else if (xbutton->button == 3) {
--    int mx = xbutton->x_root - (rootmenu->getWidth() / 2);
--    int my = xbutton->y_root - (rootmenu->getTitleHeight() / 2);
--
--    if (mx < 0) mx = 0;
--    if (my < 0) my = 0;
--
--    if (mx + rootmenu->getWidth() > getWidth())
--      mx = getWidth() - rootmenu->getWidth() - getBorderWidth();
--
--    if (my + rootmenu->getHeight() > getHeight())
--      my = getHeight() - rootmenu->getHeight() - getBorderWidth();
--
--    rootmenu->move(mx, my);
-+    rootmenu->moveInScreen(xbutton->x_root, xbutton->y_root,
-+               -static_cast<signed>(rootmenu->getWidth()) / 2,
-+               -static_cast<signed>(rootmenu->getTitleHeight()) / 2);
- 
-     if (! rootmenu->isVisible()) {
-       blackbox->checkMenu();
---- blackbox-0.65.0.orig/src/Screen.hh
-+++ blackbox-0.65.0/src/Screen.hh
-@@ -149,15 +149,16 @@
- 
-     bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise,
-       auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max,
--      focus_new, focus_last, click_raise, allow_scroll_lock;
-+      focus_new, focus_last, click_raise, allow_scroll_lock,
-+      xinerama_placement, xinerama_maximize, xinerama_menus, xinerama_toolbar;
-     BColor border_color;
-     XrmDatabase stylerc;
- 
-     unsigned int workspaces;
-     int toolbar_placement, toolbar_width_percent, placement_policy,
--      edge_snap_threshold, row_direction, col_direction;
-+      edge_snap_threshold, row_direction, col_direction, toolbar_xin_screen;
- 
--    bool slit_on_top, slit_auto_hide;
-+    bool slit_on_top, slit_auto_hide, xinerama_slit;
-     int slit_placement, slit_direction;
- 
-     unsigned int handle_width, bevel_width, frame_width, border_width;
-@@ -224,6 +225,16 @@
-   inline bool doFocusNew(void) const { return resource.focus_new; }
-   inline bool doFocusLast(void) const { return resource.focus_last; }
-   inline bool allowScrollLock(void) const { return resource.allow_scroll_lock;}
-+  inline bool doXineramaPlacement(void) const 
-+  { return resource.xinerama_placement; }
-+  inline bool doXineramaMaximize(void) const 
-+  { return resource.xinerama_maximize; }
-+  inline bool doXineramaMenus(void) const 
-+  { return resource.xinerama_menus; }
-+  inline bool doXineramaToolbar(void) const 
-+  { return resource.xinerama_toolbar; }
-+  inline bool doXineramaSlit(void) const
-+  { return resource.xinerama_slit; }
- 
-   inline const GC &getOpGC(void) const { return opGC; }
- 
-@@ -281,6 +292,8 @@
-   { return resource.row_direction; }
-   inline int getColPlacementDirection(void) const
-   { return resource.col_direction; }
-+  inline int getXineramaToolbarScreen(void) const
-+  { return resource.toolbar_xin_screen; }
- 
-   inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; }
-   inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; }
-@@ -295,6 +308,8 @@
-   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 saveXineramaToolbarScreen(int s) 
-+  { resource.toolbar_xin_screen = s;}
-   inline void saveEdgeSnapThreshold(int t)
-   { resource.edge_snap_threshold = t; }
-   inline void saveImageDither(bool d) { resource.image_dither = d; }
-@@ -303,6 +318,13 @@
-   inline void saveFocusNew(bool f) { resource.focus_new = f; }
-   inline void saveFocusLast(bool f) { resource.focus_last = f; }
-   inline void saveAllowScrollLock(bool a) { resource.allow_scroll_lock = a; }
-+  inline void saveXineramaPlacement(bool p) { resource.xinerama_placement = p; }
-+  inline void saveXineramaMaximize(bool m) { resource.xinerama_maximize = m; }
-+  inline void saveXineramaMenus(bool m) { resource.xinerama_menus = m; }
-+  inline void saveXineramaToolbar(bool t) { resource.xinerama_toolbar = t; }
-+  inline void saveXinaramaToolbarScreen(int s)
-+  { resource.toolbar_xin_screen = s; }
-+  inline void saveXineramaSlit(bool s) { resource.xinerama_slit = s; }
- 
-   inline void iconUpdate(void) { iconmenu->update(); }
- 
---- blackbox-0.65.0.orig/src/Slit.cc
-+++ blackbox-0.65.0/src/Slit.cc
-@@ -35,6 +35,7 @@
- #include "Screen.hh"
- #include "Slit.hh"
- #include "Toolbar.hh"
-+#include "Xinerama.hh"
- 
- 
- Slit::Slit(BScreen *scr) {
-@@ -481,6 +482,29 @@
- 
-   frame.rect.setPos(x, y);
- 
-+  if (screen->getXineramaInfo() && screen->doXineramaSlit()) {
-+    XineramaScreen scr = screen->getXineramaInfo()->screenContaining(frame.rect);
-+    if (!scr.isValid()) {
-+      scr = screen->getXineramaInfo()->getClosestScreen(x,y);
-+    }
-+    
-+    if (scr.isValid() && (scr.getRect() & frame.rect) != frame.rect) {
-+      int w = static_cast<signed>(frame.rect.width());
-+      if (x < scr.getRect().left())
-+        x = scr.getRect().left();
-+      else if (x + w > scr.getRect().right())
-+        x = scr.getRect().right() - w;
-+      
-+      int h = static_cast<signed>(frame.rect.height());
-+      if (y < scr.getRect().top())
-+        y = scr.getRect().top();
-+      else if (y + h > scr.getRect().bottom())
-+        y = scr.getRect().bottom() - h;
-+    
-+      frame.rect.setPos(x, y);
-+    }
-+  }
-+
-   // we have to add the border to the rect as it is not accounted for
-   Rect tbar_rect = screen->getToolbar()->getRect();
-   tbar_rect.setSize(tbar_rect.width() + (screen->getBorderWidth() * 2),
-@@ -536,22 +560,9 @@
-     XLowerWindow(display, frame.window);
-   } else if (e->button == Button3) {
-     if (! slitmenu->isVisible()) {
--      int x, y;
--
--      x = e->x_root - (slitmenu->getWidth() / 2);
--      y = e->y_root - (slitmenu->getHeight() / 2);
--
--      if (x < 0)
--        x = 0;
--      else if (x + slitmenu->getWidth() > screen->getWidth())
--        x = screen->getWidth() - slitmenu->getWidth();
--
--      if (y < 0)
--        y = 0;
--      else if (y + slitmenu->getHeight() > screen->getHeight())
--        y = screen->getHeight() - slitmenu->getHeight();
--
--      slitmenu->move(x, y);
-+      slitmenu->moveInScreen(e->x_root, e->y_root,
-+                       -static_cast<signed>(slitmenu->getWidth()) / 2,
-+                       -static_cast<signed>(slitmenu->getHeight()) / 2);
-       slitmenu->show();
-     } else {
-       slitmenu->hide();
---- blackbox-0.65.0.orig/src/Timer.hh
-+++ blackbox-0.65.0/src/Timer.hh
-@@ -98,9 +98,9 @@
-   ~_timer_queue(void) {}
- 
-   void release(const _Tp& value) {
--    c.erase(std::remove(c.begin(), c.end(), value), c.end());
-+    this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end());
-     // after removing the item we need to make the heap again
--    std::make_heap(c.begin(), c.end(), comp);
-+    std::make_heap(this->c.begin(), this->c.end(), this->comp);
-   }
-   bool empty(void) const { return _Base::empty(); }
-   size_t size(void) const { return _Base::size(); }
---- blackbox-0.65.0.orig/src/Toolbar.cc
-+++ blackbox-0.65.0/src/Toolbar.cc
-@@ -62,6 +62,7 @@
- #include "Clientmenu.hh"
- #include "Workspacemenu.hh"
- #include "Slit.hh"
-+#include "Xinerama.hh"
- 
- 
- static long aMinuteFromNow(void) {
-@@ -198,8 +199,56 @@
- 
- 
- void Toolbar::reconfigure(void) {
-+  Rect rect = screen->getRect();
-+  
-+  if (screen->getXineramaInfo() && screen->doXineramaToolbar()) {
-+    
-+    XineramaScreen xinerama = 
-+      screen->getXineramaInfo()->getScreen(screen->getXineramaToolbarScreen());
-+    
-+    if (! xinerama.isValid()) {
-+      
-+      XineramaList list;
-+      switch (screen->getToolbarPlacement()) {
-+        case TopLeft:
-+        case TopRight:
-+        case TopCenter:
-+          screen->getXineramaInfo()->getTopScreens(list);
-+          break;
-+        case BottomLeft:
-+        case BottomRight:
-+        case BottomCenter:
-+        default:
-+          screen->getXineramaInfo()->getBottomScreens(list);
-+          break;
-+      }
-+      
-+      switch (screen->getToolbarPlacement()) {
-+        case TopLeft: 
-+        case BottomLeft:
-+          xinerama = *list.begin();
-+          break;
-+        case TopRight: 
-+        case BottomRight:
-+          xinerama = *list.rbegin();
-+          break;
-+        case TopCenter: 
-+        case BottomCenter:
-+        default: {
-+          XineramaList::iterator itr = list.begin();
-+          for (int count = list.size()/2; count--; ++itr);
-+          xinerama = *itr;
-+          break;
-+        }
-+      }
-+      screen->saveXineramaToolbarScreen(xinerama.getScreenNumber());
-+    }  // end if (invalid xinerama screen)
-+    
-+    rect = xinerama.getRect();
-+  } // end if (xinerama)
-+
-   unsigned int height = 0,
--    width = (screen->getWidth() * screen->getToolbarWidthPercent()) / 100;
-+    width = (rect.width() * screen->getToolbarWidthPercent()) / 100;
- 
-   if (i18n.multibyte())
-     height = screen->getToolbarStyle()->fontset_extents->max_ink_extent.height;
-@@ -218,18 +267,25 @@
-   int x, y;
-   switch (screen->getToolbarPlacement()) {
-   case TopLeft:
-+  case BottomLeft:
-+    x = rect.left();
-+    break;
-   case TopRight:
--  case TopCenter:
--    if (screen->getToolbarPlacement() == TopLeft)
--      x = 0;
--    else if (screen->getToolbarPlacement() == TopRight)
--      x = screen->getWidth() - frame.rect.width()
-+  case BottomRight:
-+    x = rect.left() + rect.width() - frame.rect.width()
-         - (screen->getBorderWidth() * 2);
--    else
--      x = (screen->getWidth() - frame.rect.width()) / 2;
--
--    y = 0;
--
-+    break;
-+  case TopCenter:
-+  case BottomCenter:
-+  default:
-+    x = rect.left() + (rect.width() - frame.rect.width()) / 2;
-+    break;
-+  }  
-+  switch (screen->getToolbarPlacement()) {  
-+  case TopLeft:
-+  case TopRight:
-+  case TopCenter:
-+    y = rect.top();
-     frame.x_hidden = x;
-     frame.y_hidden = screen->getBevelWidth() - screen->getBorderWidth()
-                      - frame.rect.height();
-@@ -239,19 +295,11 @@
-   case BottomRight:
-   case BottomCenter:
-   default:
--    if (screen->getToolbarPlacement() == BottomLeft)
--      x = 0;
--    else if (screen->getToolbarPlacement() == BottomRight)
--      x = screen->getWidth() - frame.rect.width()
--        - (screen->getBorderWidth() * 2);
--    else
--      x = (screen->getWidth() - frame.rect.width()) / 2;
--
--    y = screen->getHeight() - frame.rect.height()
-+    y = rect.bottom() - frame.rect.height()
-       - (screen->getBorderWidth() * 2);
- 
-     frame.x_hidden = x;
--    frame.y_hidden = screen->getHeight() - screen->getBevelWidth()
-+    frame.y_hidden = rect.bottom() - screen->getBevelWidth()
-                      - screen->getBorderWidth();
-     break;
-   }
-@@ -758,22 +806,9 @@
-     if (toolbarmenu->isVisible()) {
-       toolbarmenu->hide();
-     } else {
--      int x, y;
--
--      x = be->x_root - (toolbarmenu->getWidth() / 2);
--      y = be->y_root - (toolbarmenu->getHeight() / 2);
--
--      if (x < 0)
--        x = 0;
--      else if (x + toolbarmenu->getWidth() > screen->getWidth())
--        x = screen->getWidth() - toolbarmenu->getWidth();
--
--      if (y < 0)
--        y = 0;
--      else if (y + toolbarmenu->getHeight() > screen->getHeight())
--        y = screen->getHeight() - toolbarmenu->getHeight();
--
--      toolbarmenu->move(x, y);
-+      toolbarmenu->moveInScreen(be->x_root, be->y_root,
-+                      -static_cast<signed>(toolbarmenu->getWidth()) / 2,
-+                      -static_cast<signed>(toolbarmenu->getHeight()) / 2);
-       toolbarmenu->show();
-     }
-   }
-@@ -1069,21 +1104,88 @@
-   : Basemenu(tm->toolbar->screen) {
-   setLabel(i18n(ToolbarSet, ToolbarToolbarPlacement, "Toolbar Placement"));
-   setInternalMenu();
--  setMinimumSublevels(3);
-+  reconfigure();
-+}
- 
--  insert(i18n(CommonSet, CommonPlacementTopLeft, "Top Left"),
--         Toolbar::TopLeft);
--  insert(i18n(CommonSet, CommonPlacementBottomLeft, "Bottom Left"),
--         Toolbar::BottomLeft);
--  insert(i18n(CommonSet, CommonPlacementTopCenter, "Top Center"),
--         Toolbar::TopCenter);
--  insert(i18n(CommonSet, CommonPlacementBottomCenter, "Bottom Center"),
--         Toolbar::BottomCenter);
--  insert(i18n(CommonSet, CommonPlacementTopRight, "Top Right"),
--         Toolbar::TopRight);
--  insert(i18n(CommonSet, CommonPlacementBottomRight, "Bottom Right"),
--         Toolbar::BottomRight);
-+void Toolbarmenu::Placementmenu::reconfigure(void)
-+{
-+  for (int count = getCount(); count > 0; count = remove(count-1));
-+  
-+  if (getScreen()->getXineramaInfo() && getScreen()->doXineramaToolbar()) {
-+    char buffer[256];
-+    XineramaList top_list, bottom_list;
-+    getScreen()->getXineramaInfo()->getTopScreens(top_list);
-+    getScreen()->getXineramaInfo()->getBottomScreens(bottom_list);
-+    int width = std::max(top_list.size(),bottom_list.size()) + 2;
-+    setMinimumSublevels(width);
-+
-+    XineramaList::const_iterator top = top_list.begin();
-+    XineramaList::const_iterator bottom = bottom_list.begin();
-+    
-+    insert(i18n(CommonSet, CommonPlacementTopLeft, "Top Left"),
-+      handleFromPlacement(Toolbar::TopLeft, top->getScreenNumber()));
-+    insert(i18n(CommonSet, CommonPlacementBottomLeft, "Bottom Left"),
-+      handleFromPlacement(Toolbar::BottomLeft, bottom->getScreenNumber()));
-+
-+    for (int count = width - 2; count--; ) {
-+      if (top != top_list.end()) {
-+        sprintf(buffer,
-+          i18n(ToolbarSet, ToolbarScreenTop, "Screen %d Top"), 
-+          top->getScreenNumber());
-+        insert(buffer,
-+          handleFromPlacement(Toolbar::TopCenter,top->getScreenNumber()));
-+        ++top;
-+      }
-+      else {
-+        insert("",-2);
-+      }
-+      
-+      if (bottom != bottom_list.end()) {
-+        sprintf(buffer,
-+          i18n(ToolbarSet, ToolbarScreenBottom, "Screen %d Bottom"), 
-+          bottom->getScreenNumber());
-+        insert(buffer,
-+          handleFromPlacement(Toolbar::BottomCenter,bottom->getScreenNumber()));
-+        ++bottom;
-+      }
-+      else {
-+        insert("",-2);
-+      }
-+    }  
-+
-+    int last_scr = top_list.rbegin()->getScreenNumber();
-+    insert(i18n(CommonSet, CommonPlacementTopRight, "Top Right"),
-+      handleFromPlacement(Toolbar::TopRight, last_scr));
-+    last_scr = bottom_list.rbegin()->getScreenNumber();
-+    insert(i18n(CommonSet, CommonPlacementBottomRight, "Bottom Right"),
-+      handleFromPlacement(Toolbar::BottomRight, last_scr));
-+      
-+    update();
-+    
-+    for (int index = 0; index < static_cast<signed>(getCount()); index++) {
-+      if (find(index)->function() == -2) {
-+        setItemEnabled(index, false);
-+      }
-+    }
-+  }    
-+  else {
-+    setMinimumSublevels(3);
-+
-+    insert(i18n(CommonSet, CommonPlacementTopLeft, "Top Left"),
-+           Toolbar::TopLeft);
-+    insert(i18n(CommonSet, CommonPlacementBottomLeft, "Bottom Left"),
-+           Toolbar::BottomLeft);
-+    insert(i18n(CommonSet, CommonPlacementTopCenter, "Top Center"),
-+           Toolbar::TopCenter);
-+    insert(i18n(CommonSet, CommonPlacementBottomCenter, "Bottom Center"),
-+           Toolbar::BottomCenter);
-+    insert(i18n(CommonSet, CommonPlacementTopRight, "Top Right"),
-+           Toolbar::TopRight);
-+    insert(i18n(CommonSet, CommonPlacementBottomRight, "Bottom Right"),
-+           Toolbar::BottomRight);
-+  }
-   update();
-+  Basemenu::reconfigure();
- }
- 
- 
-@@ -1094,7 +1196,14 @@
-   BasemenuItem *item = find(index);
-   if (! item) return;
- 
--  getScreen()->saveToolbarPlacement(item->function());
-+  int placement = Placementmenu::placementFromHandle(item->function());
-+  getScreen()->saveToolbarPlacement(placement);
-+
-+  if (getScreen()->getXineramaInfo() && getScreen()->doXineramaToolbar()) {
-+    int xinerama  = Placementmenu::xineramaFromHandle(item->function());
-+    getScreen()->saveXineramaToolbarScreen(xinerama);
-+  }
-+  
-   hide();
-   getScreen()->getToolbar()->reconfigure();
- 
---- blackbox-0.65.0.orig/src/Toolbar.hh
-+++ blackbox-0.65.0/src/Toolbar.hh
-@@ -47,6 +47,15 @@
- 
-   public:
-     Placementmenu(Toolbarmenu *tm);
-+    
-+    inline static int handleFromPlacement(int placement, int xinerama_screen)
-+      { return ((xinerama_screen+1) << 3) | placement; }
-+    inline static int placementFromHandle(int handle)
-+      { return handle & 0x7; }
-+    inline static int xineramaFromHandle(int handle)
-+      { return (handle >> 3)-1; }
-+      
-+    void reconfigure(void);
-   };
- 
-   Toolbar *toolbar;
---- blackbox-0.65.0.orig/src/Util.hh
-+++ blackbox-0.65.0/src/Util.hh
-@@ -29,6 +29,14 @@
- 
- #include <string>
- 
-+struct Point {
-+  inline Point(void) : x(0), y(0) {}
-+  inline Point(int set_x, int set_y) : x(set_x), y(set_y) {}
-+  inline void set(int set_x, int set_y) 
-+    { x = set_x; y = set_y; }
-+  int x, y;
-+};
-+
- class Rect {
- public:
-   inline Rect(void) : _x1(0), _y1(0), _x2(0), _y2(0) { }
-@@ -51,6 +59,7 @@
- 
-   inline unsigned int width(void) const { return _x2 - _x1 + 1; }
-   inline unsigned int height(void) const { return _y2 - _y1 + 1; }
-+  inline int area(void) const { return width() * height(); }
-   void setWidth(unsigned int __w);
-   void setHeight(unsigned int __h);
-   void setSize(unsigned int __w, unsigned int __h);
-@@ -71,6 +80,9 @@
-   inline bool valid(void) const { return _x2 > _x1 && _y2 > _y1; }
- 
-   bool intersects(const Rect &a) const;
-+  
-+  inline bool contains( int x, int y ) const
-+    { return (x >= _x1) && (x <= _x2) && (y >= _y1) && (y <= _y2); }
- 
- private:
-   int _x1, _y1, _x2, _y2;
---- blackbox-0.65.0.orig/src/Window.cc
-+++ blackbox-0.65.0/src/Window.cc
-@@ -44,6 +44,8 @@
- #endif // HAVE_STDLIB_H
- }
- 
-+#include <cassert>
-+
- #include "i18n.hh"
- #include "blackbox.hh"
- #include "GCCache.hh"
-@@ -55,6 +57,7 @@
- #include "Window.hh"
- #include "Windowmenu.hh"
- #include "Workspace.hh"
-+#include "Xinerama.hh"
- 
- 
- /*
-@@ -208,8 +211,16 @@
-       client.normal_hint_flags & (PPosition|USPosition)) {
-     applyGravity(frame.rect);
- 
--    if (blackbox->isStartup() || client.rect.intersects(screen->getRect()))
-+    if (blackbox->isStartup()) { 
-+      place_window = False;
-+    }
-+    else if (s->getXineramaInfo() && s->doXineramaPlacement()) {
-+      if (s->getXineramaInfo()->screenContaining(client.rect).isValid())
-+        place_window = False;
-+    }
-+    else if (client.rect.intersects(screen->getRect())) {
-       place_window = False;
-+    }
-   }
- 
-   /*
-@@ -1626,7 +1637,13 @@
-   blackbox_attrib.premax_h =
-     client.rect.height() + frame.margin.top + frame.margin.bottom;
- 
--  const Rect &screen_area = screen->availableArea();
-+  Rect screen_area = screen->availableArea();
-+  if (screen->getXineramaInfo() && screen->doXineramaMaximize())  {
-+    XineramaScreen xinerama 
-+      = screen->getXineramaInfo()->screenContaining(frame.rect);
-+    if (xinerama.isValid()) 
-+      screen_area &= xinerama.getRect();
-+  }
-   frame.changing = screen_area;
- 
-   switch(button) {
-@@ -3288,6 +3305,7 @@
-   do {
-     if (multibyte) {
-       XRectangle ink, logical;
-+      if (text_len>100) text_len=100;
-       XmbTextExtents(fontset, text, text_len, &ink, &logical);
-       length = logical.width;
-     } else {
---- blackbox-0.65.0.orig/src/Workspace.cc
-+++ blackbox-0.65.0/src/Workspace.cc
-@@ -55,13 +55,12 @@
- #include "Window.hh"
- #include "Workspace.hh"
- #include "Windowmenu.hh"
-+#include "Xinerama.hh"
- 
- 
- Workspace::Workspace(BScreen *scrn, unsigned int i) {
-   screen = scrn;
- 
--  cascade_x = cascade_y = 32;
--
-   id = i;
- 
-   clientmenu = new Clientmenu(this);
-@@ -123,9 +122,6 @@
-   for (; it != end; ++it, ++i)
-     (*it)->setWindowNumber(i);
- 
--  if (i == 0)
--    cascade_x = cascade_y = 32;
--
-   return i;
- }
- 
-@@ -548,8 +544,19 @@
- 
- bool Workspace::smartPlacement(Rect& win, const Rect& availableArea) {
-   rectList spaces;
--  spaces.push_back(availableArea); //initially the entire screen is free
- 
-+  // If xinerama info, initialize spaces to available xinerama screens
-+  if (screen->getXineramaInfo() && screen->doXineramaPlacement()) {
-+    const XineramaList& list = screen->getXineramaInfo()->getScreens();
-+    for (XineramaList::const_iterator itr = list.begin();
-+         itr != list.end(); ++itr) {
-+      spaces.push_back(availableArea & itr->getRect());
-+    }
-+  }
-+  else {
-+    spaces.push_back(availableArea); //initially the entire screen is free
-+  }
-+  
-   //Find Free Spaces
-   BlackboxWindowList::const_iterator wit = windowList.begin(),
-     end = windowList.end();
-@@ -621,17 +628,45 @@
- }
- 
- 
--bool Workspace::cascadePlacement(Rect &win, const Rect &availableArea) {
--  if (cascade_x > (availableArea.width() / 2) ||
--      cascade_y > (availableArea.height() / 2))
--    cascade_x = cascade_y = 32;
--
--  if (cascade_x == 32) {
--    cascade_x += availableArea.x();
--    cascade_y += availableArea.y();
--  }
--
--  win.setPos(cascade_x, cascade_y);
-+bool Workspace::cascadePlacement(Rect &win, Rect availableArea, int offset) {
-+  
-+  // Place window in whichever xinerama screen contains the
-+  // pointer.
-+  int xinerama_screen = 0;
-+  if (screen->getXineramaInfo() && screen->doXineramaPlacement()) {
-+    int ptr_x, ptr_y, x, y;
-+    Window c, r;
-+    unsigned int m;
-+    XQueryPointer(screen->getBaseDisplay()->getXDisplay(), 
-+                  screen->getRootWindow(),
-+                  &r, &c, &ptr_x, &ptr_y, &x, &y, &m);
-+    XineramaScreen xinerama = 
-+      screen->getXineramaInfo()->screenContaining(ptr_x, ptr_y);
-+    if (! xinerama.isValid())
-+      xinerama = *(screen->getXineramaInfo()->getScreens().begin());
-+    xinerama_screen = xinerama.getScreenNumber();
-+    availableArea &= xinerama.getRect();
-+  }
-+  
-+  if (cascade_points.count(xinerama_screen) == 0) {
-+    cascade_points[xinerama_screen] = Point(32,32);
-+  }
-+  Point& pos = cascade_points[xinerama_screen];
-+
-+  if (pos.x < (availableArea.left() + 32) ||
-+      pos.y < (availableArea.top() + 32) ||
-+      pos.x > (availableArea.left() + (int)availableArea.width() / 2) ||
-+      pos.y > (availableArea.top()  + (int)availableArea.height() / 2))
-+    pos.x = pos.y = 32;
-+
-+  if (pos.x == 32) {
-+    pos.x += availableArea.x();
-+    pos.y += availableArea.y();
-+  }
-+
-+  win.setPos(pos.x, pos.y);
-+  pos.x += offset;
-+  pos.y += offset;
- 
-   return True;
- }
-@@ -653,9 +688,8 @@
-   } // switch
- 
-   if (placed == False) {
--    cascadePlacement(new_win, availableArea);
--    cascade_x += win->getTitleHeight() + (screen->getBorderWidth() * 2);
--    cascade_y += win->getTitleHeight() + (screen->getBorderWidth() * 2);
-+    cascadePlacement(new_win, availableArea,
-+                     win->getTitleHeight() + (screen->getBorderWidth() * 2));
-   }
- 
-   if (new_win.right() > availableArea.right())
---- blackbox-0.65.0.orig/src/Workspace.hh
-+++ blackbox-0.65.0/src/Workspace.hh
-@@ -51,7 +51,7 @@
- 
-   std::string name;
-   unsigned int id;
--  unsigned int cascade_x, cascade_y;
-+  std::map<int,Point> cascade_points;
- 
-   Workspace(const Workspace&);
-   Workspace& operator=(const Workspace&);
-@@ -62,7 +62,7 @@
-                        StackVector::iterator &stack);
- 
-   void placeWindow(BlackboxWindow *win);
--  bool cascadePlacement(Rect& win, const Rect& availableArea);
-+  bool cascadePlacement(Rect& win, Rect availableArea, int offset);
-   bool smartPlacement(Rect& win, const Rect& availableArea);
- 
- public:
---- blackbox-0.65.0.orig/src/blackbox.cc
-+++ blackbox-0.65.0/src/blackbox.cc
-@@ -1094,6 +1094,26 @@
-             screen_number, placement);
-     XrmPutLineResource(&new_blackboxrc, rc_string);
- 
-+    // write out xinerama settings
-+    sprintf(rc_string, "session.screen%d.xineramaPlacement: %s",
-+      screen_number, screen->doXineramaPlacement() ? "True" : "False");
-+    XrmPutLineResource(&new_blackboxrc, rc_string);
-+    sprintf(rc_string, "session.screen%d.xineramaMaximize: %s",
-+      screen_number, screen->doXineramaMaximize() ? "True" : "False");
-+    XrmPutLineResource(&new_blackboxrc, rc_string);
-+    sprintf(rc_string, "session.screen%d.xineramaMenuPlacement: %s",
-+      screen_number, screen->doXineramaMenus() ? "True" : "False");
-+    XrmPutLineResource(&new_blackboxrc, rc_string);
-+    sprintf(rc_string, "session.screen%d.slit.xineramaPlacement: %s",
-+      screen_number, screen->doXineramaSlit() ? "True" : "False");
-+    XrmPutLineResource(&new_blackboxrc, rc_string);
-+    sprintf(rc_string, "session.screen%d.toolbar.xineramaPlacement: %s",
-+      screen_number, screen->doXineramaToolbar() ? "True" : "False");
-+    XrmPutLineResource(&new_blackboxrc, rc_string);
-+    sprintf(rc_string, "session.screen%d.toolbar.xineramaScreen: %d",
-+      screen_number, screen->getXineramaToolbarScreen());
-+    XrmPutLineResource(&new_blackboxrc, rc_string);
-+
-     load_rc(screen);
- 
-     // these are static, but may not be saved in the users .blackboxrc,
-@@ -1215,7 +1235,6 @@
-   }
- }
- 
--
- void Blackbox::load_rc(BScreen *screen) {
-   XrmDatabase database = (XrmDatabase) 0;
- 
-@@ -1492,6 +1511,50 @@
-       ! strncasecmp("true", value.addr, value.size)) {
-     screen->saveOpaqueMove(True);
-   }
-+  
-+    // load xinerama settings
-+  sprintf(name_lookup,  "session.screen%d.xineramaPlacement", screen_number);
-+  sprintf(class_lookup, "Session.Screen%d.XineramaPlacement", screen_number);
-+  screen->saveXineramaPlacement(true);
-+  if ((XrmGetResource(database,name_lookup,class_lookup,&value_type,&value))
-+    && ! strncasecmp("false", value.addr, value.size)) {
-+    screen->saveXineramaPlacement(false);
-+  }
-+  sprintf(name_lookup,  "session.screen%d.xineramaMaximize", screen_number);
-+  sprintf(class_lookup, "Session.Screen%d.XineramaMaximize", screen_number);
-+  screen->saveXineramaMaximize(true);
-+  if ((XrmGetResource(database,name_lookup,class_lookup,&value_type,&value))
-+    && ! strncasecmp("false", value.addr, value.size)) {
-+    screen->saveXineramaMaximize(false);
-+  }
-+  sprintf(name_lookup,  "session.screen%d.xineramaMenuPlacement", screen_number);
-+  sprintf(class_lookup, "Session.Screen%d.XineramaMenuPlacement", screen_number);
-+  screen->saveXineramaMenus(true);
-+  if ((XrmGetResource(database,name_lookup,class_lookup,&value_type,&value))
-+    && ! strncasecmp("false", value.addr, value.size)) {
-+    screen->saveXineramaMenus(false);
-+  }
-+  sprintf(name_lookup,  "session.screen%d.slit.xineramaPlacement", screen_number);
-+  sprintf(class_lookup, "Session.Screen%d.Slit.XineramaPlacement", screen_number);
-+  screen->saveXineramaSlit(true);
-+  if ((XrmGetResource(database,name_lookup,class_lookup,&value_type,&value))
-+    && ! strncasecmp("false", value.addr, value.size)) {
-+    screen->saveXineramaSlit(false);
-+  }
-+  sprintf(name_lookup,  "session.screen%d.toolbar.xineramaPlacement", screen_number);
-+  sprintf(class_lookup, "Session.Screen%d.Toolbar.XineramaPlacement", screen_number);
-+  screen->saveXineramaToolbar(true);
-+  if ((XrmGetResource(database,name_lookup,class_lookup,&value_type,&value))
-+    && ! strncasecmp("false", value.addr, value.size)) {
-+    screen->saveXineramaToolbar(false);
-+  }
-+  sprintf(name_lookup,  "session.screen%d.toolbar.xineramaScreen", screen_number);
-+  sprintf(class_lookup, "Session.Screen%d.Toolbar.XineramaScreen", screen_number);
-+  screen->saveXineramaToolbarScreen(-1);
-+  if ((XrmGetResource(database,name_lookup,class_lookup,&value_type,&value))
-+    && sscanf(value.addr, "%d", &int_value) == 1) {
-+    screen->saveXineramaToolbarScreen(int_value);
-+  }
- 
-   XrmDestroyDatabase(database);
- }
---- blackbox-0.65.0.orig/src/Xinerama.cc
-+++ blackbox-0.65.0/src/Xinerama.cc
-@@ -0,0 +1,153 @@
-+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-+// Xinerama.cc for Blackbox - an X11 Window manager
-+// Copyright (c) 2002 Jason Kraftcheck <kraftche@cae.wisc.edu>
-+//
-+// 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.
-+
-+
-+extern "C" {
-+#include <X11/Xlib.h>
-+#ifdef XINERAMA
-+#  include <X11/extensions/Xinerama.h>
-+#endif
-+}
-+
-+#include "Xinerama.hh"
-+#include "BaseDisplay.hh"
-+
-+bool XineramaInfo::update(void)
-+{
-+  screen_list.clear();
-+  
-+#ifdef XINERAMA
-+  int count;
-+  XineramaScreenInfo* xinerama_list = XineramaQueryScreens( 
-+    screen_info->getBaseDisplay()->getXDisplay(), &count );
-+  if (xinerama_list) {
-+    if (count > 1) {
-+      for( int i = 0; i < count; i++ ) {
-+        const XineramaScreenInfo& scr = xinerama_list[i];
-+        screen_list.push_back( XineramaScreen( scr.screen_number, 
-+          Rect( scr.x_org, scr.y_org, scr.width, scr.height ) ) );
-+      }
-+    }
-+    XFree(xinerama_list);
-+  }
-+#endif
-+
-+  return haveXinerama();
-+}
-+
-+XineramaScreen XineramaInfo::screenContaining( int x, int y ) const
-+{
-+  XineramaList::const_iterator itr = getScreens().begin(), 
-+                               end = getScreens().end();
-+  
-+  for ( ; itr != end; ++itr) {
-+    if (itr->getRect().contains(x,y))
-+      return *itr;
-+  };
-+  
-+  return XineramaScreen();
-+}
-+
-+XineramaScreen XineramaInfo::screenContaining( const Rect& rect ) const
-+{
-+  XineramaScreen result;
-+  int area = 0;
-+  XineramaList::const_iterator itr = getScreens().begin(), 
-+                               end = getScreens().end();
-+  for ( ; itr != end; ++itr) {
-+    if (itr->getRect().intersects(rect)) {
-+      int a = (itr->getRect() & rect).area();
-+      if (a > area) {
-+        result = *itr;
-+        area = a;
-+      }
-+    }
-+  }
-+  return result;
-+}
-+
-+
-+XineramaScreen XineramaInfo::getScreen( int x_screen_number ) const
-+{
-+  XineramaList::const_iterator itr = getScreens().begin(), 
-+                               end = getScreens().end();
-+  for ( ; itr != end; ++itr) {
-+    if (itr->getScreenNumber() == x_screen_number)
-+      return *itr;
-+  }
-+  
-+  return XineramaScreen();
-+}
-+
-+
-+void XineramaInfo::getTopBottom( XineramaList& result, bool top ) const
-+{
-+  for (XineramaList::const_iterator in_itr = screen_list.begin(); 
-+       in_itr != screen_list.end(); ++in_itr) {
-+    
-+    XineramaList::iterator out_itr = result.begin();
-+    while (out_itr != result.end() && 
-+           in_itr->getRect().left() >= out_itr->getRect().right())
-+      ++out_itr;
-+    
-+    if (out_itr == result.end()) {
-+      result.push_back(*in_itr);
-+    }
-+    else if (in_itr->getRect().right() <= out_itr->getRect().left()) {
-+      result.insert(out_itr,*in_itr);
-+    }
-+    else if ((!top && in_itr->getRect().bottom() > out_itr->getRect().bottom()) ||
-+             ( top &&    in_itr->getRect().top() < out_itr->getRect().top())) {
-+      *out_itr = *in_itr;
-+    }
-+  }
-+}
-+
-+XineramaScreen XineramaInfo::getClosestScreen( int x, int y ) const
-+{
-+  if (getScreens().empty())
-+    return XineramaScreen();
-+  
-+  XineramaList::const_iterator itr = screen_list.begin();
-+  XineramaScreen result(*itr);
-+  unsigned long dist_sqr = distanceSquared(itr->getRect(),x,y);
-+  ++itr;
-+  
-+  for ( ; itr != screen_list.end(); ++itr) {
-+    unsigned long ds = distanceSquared(itr->getRect(), x, y);
-+    if (ds < dist_sqr) {
-+      dist_sqr = ds;
-+      result = *itr;
-+    }
-+  }
-+
-+  return result;
-+}
-+
-+unsigned long XineramaInfo::distanceSquared(const Rect& rect,int x,int y)
-+{
-+  unsigned long x_dist = (x < rect.left()  ) ? rect.left() - x   :
-+                         (x > rect.right() ) ? x - rect.right()  : 0;
-+  unsigned long y_dist = (y < rect.top()   ) ? rect.top() - y    :
-+                         (y > rect.bottom()) ? y - rect.bottom() : 0;
-+  return x_dist * x_dist + y_dist * y_dist;
-+}
---- blackbox-0.65.0.orig/src/Xinerama.hh
-+++ blackbox-0.65.0/src/Xinerama.hh
-@@ -0,0 +1,93 @@
-+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-+// Xinerama.hh for Blackbox - an X11 Window manager
-+// Copyright (c) 2002 Jason Kraftcheck <kraftche@cae.wisc.edu>
-+//
-+// 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   __Xinerama_hh
-+#define   __Xinerama_hh
-+
-+#include <list>
-+
-+#include "Util.hh"
-+
-+class XineramaScreen;
-+class ScreenInfo;
-+
-+typedef std::list<XineramaScreen> XineramaList;
-+
-+class XineramaScreen {
-+private:
-+  int x_screen;
-+  Rect rect;
-+  
-+public:
-+  inline XineramaScreen( int screen_number, const Rect& box )
-+    : x_screen(screen_number), rect(box) { }
-+  
-+  inline XineramaScreen(void)
-+    : x_screen(-1) { }
-+  
-+  inline const Rect& getRect(void) const { return rect; }
-+  inline int getScreenNumber(void) const { return x_screen; }
-+    
-+  inline bool operator==( const XineramaScreen& other ) const
-+    { return x_screen == other.x_screen; }
-+
-+  inline bool operator!=( const XineramaScreen& other ) const
-+    { return x_screen != other.x_screen; }
-+    
-+  inline bool isValid(void) const { return x_screen >= 0; }
-+};
-+
-+class XineramaInfo {
-+private:
-+  XineramaList screen_list;
-+  ScreenInfo* screen_info;
-+
-+protected:  
-+  void getTopBottom( XineramaList& result_list, bool top ) const;
-+  
-+  static unsigned long distanceSquared( const Rect& rect, int x, int y );
-+  
-+public:
-+  inline XineramaInfo( ScreenInfo* screen ) : screen_info(screen)
-+    { update(); }
-+  
-+  inline bool haveXinerama(void) const 
-+    { return !screen_list.empty(); }
-+  
-+  inline const XineramaList& getScreens(void) const 
-+    { return screen_list; }
-+  
-+  bool update(void);
-+  
-+  XineramaScreen screenContaining( int x, int y ) const;
-+  XineramaScreen screenContaining( const Rect& rect ) const;
-+  XineramaScreen getScreen( int x_screen_number ) const;
-+  XineramaScreen getClosestScreen( int x, int y ) const;
-+  
-+  inline void getTopScreens( XineramaList& result_list ) const
-+    { getTopBottom( result_list, true ); }
-+    
-+  inline void getBottomScreens( XineramaList& result_list ) const
-+    { getTopBottom( result_list, false ); }
-+};
-+
-+#endif
---- blackbox-0.65.0.orig/util/Makefile.in
-+++ blackbox-0.65.0/util/Makefile.in
-@@ -79,7 +79,7 @@
- bin_PROGRAMS = bsetroot
- 
- bsetroot_SOURCES = bsetroot.cc
--bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
-+bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o ../src/Xinerama.o
- 
- MAINTAINERCLEANFILES = Makefile.in
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- blackbox-0.65.0.orig/debian/changelog
-+++ blackbox-0.65.0/debian/changelog
-@@ -0,0 +1,188 @@
-+blackbox (0.65.0-5) unstable; urgency=high
-+
-+  * Fixed FTBFS with the missing build dependency on autoconf. 
-+    (closes: #291133)
-+
-+ -- Bruno Barrera C. <bruno@debian.org>  Tue, 18 Jan 2005 20:22:45 -0300
-+
-+blackbox (0.65.0-4) unstable; urgency=low
-+
-+  * Fixed the string length problem. (closes: #178001)
-+  * Added Xinerama support. (closes: #277517) 
-+
-+ -- Bruno Barrera C. <bruno@debian.org>  Mon, 17 Jan 2005 23:27:56 -0300
-+
-+blackbox (0.65.0-3) unstable; urgency=low
-+
-+  * Fixed FTBFS with gcc-3.4 (closes: #266642)
-+  * debian/postinst now checks for the correct files to be removed
-+    (blackbox-menu instead Blackbox-menu)
-+
-+ -- Bruno Barrera C. <bruno.barrera@igloo.cl>  Fri, 20 Aug 2004 21:44:55 -0400
-+
-+blackbox (0.65.0-2) unstable; urgency=low
-+
-+  * New Maintainer (closes: #259585)
-+  * Corrected menu-method coding (closes: #251237)
-+  * Added a blackbox.desktop file. (closes: #257423)
-+  * Completed the debian/copyright file.
-+ 
-+ -- Bruno Barrera C. <bruno.barrera@igloo.cl>  Fri, 16 Jul 2004 18:26:04 -0400
-+
-+blackbox (0.65.0-1.2) unstable; urgency=low
-+
-+  * Non Maintainer Upload
-+  * Patch by Matt Kraai to solve FTBFS: Closes: #208814.
-+
-+ -- Jesus Climent <jesus.climent@hispalinux.es>  Wed, 15 Oct 2003 15:38:53 +0300
-+
-+blackbox (0.65.0-1.1) unstable; urgency=low
-+
-+  * Non Maintainer Upload
-+  * Include <cassert> in src/Window.cc (Closes: #196245)
-+
-+ -- David Pashley <david@davidpashley.com>  Tue, 15 Jul 2003 16:36:04 +0200
-+
-+blackbox (0.65.0-1) unstable; urgency=low
-+
-+  * new upstream release
-+  * now has man pages for all binaries, closes: #93427
-+  * newer version of bsetbg behaves much better, closes: #109606
-+  * tilde expansion in blackboxrc and menus is now supported, closes: #139330
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Wed, 18 Sep 2002 11:02:00 -0700
-+
-+blackbox (0.65.0-0.pre1) unstable; urgency=low
-+
-+  * temporary deb
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Fri,  6 Sep 2002 19:33:37 -0700
-+
-+blackbox (0.62.1-1) unstable; urgency=low
-+
-+  * new upstream release
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Wed, 30 Jan 2002 22:17:06 -0800
-+
-+blackbox (0.62.0-1) unstable; urgency=low
-+
-+  * new upstream
-+  * I am now the upstream (-:
-+  * upstream fixes these, Closes: #72254, #103909, #116767
-+  * Documented update-menu and blackbox behaviour (closes: #117386)
-+  * Added README.menu and .style (closes: #81008)
-+  * removed empty dir (closes: #78777)
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Sat, 19 Jan 2002 11:22:06 -0800
-+
-+blackbox (0.61.1-1.1) unstable; urgency=low
-+
-+  * NMU
-+  * Fix unsafe temp files in bsetbg.  Closes: #102126
-+  * Add class key as needed, printf is a macro as of gcc 3.0.  Closes: #105452
-+
-+ -- LaMont Jones <lamont@smallone.fc.hp.com>  Sun, 15 Jul 2001 23:29:46 -0600
-+
-+blackbox (0.61.1-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Mon,  9 Oct 2000 10:10:31 -0700
-+
-+blackbox (0.61.0-3) unstable; urgency=low
-+
-+  * Changed menu-method to call x-terminal-emulator instead of xterm
-+  * Closes: #71981
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Wed, 20 Sep 2000 11:41:45 -0700
-+
-+blackbox (0.61.0-2) unstable; urgency=low
-+
-+  * removed echo from the postinst
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu, 31 Aug 2000 11:35:39 -0700
-+
-+blackbox (0.61.0-1) unstable; urgency=low
-+
-+  * New upstream
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Fri, 18 Aug 2000 13:29:31 -0700
-+
-+blackbox (0.61.0.20000806-1) unstable; urgency=low
-+
-+  * New upstream
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Mon,  7 Aug 2000 10:19:22 -0700
-+
-+blackbox (0.61.0.20000726-2) unstable; urgency=low
-+
-+  * Oops, forgot to re-run autofriends
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Wed, 26 Jul 2000 16:39:15 -0700
-+
-+blackbox (0.61.0.20000726-1) unstable; urgency=low
-+
-+  * New upstream beta
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Wed, 26 Jul 2000 13:10:07 -0700
-+
-+blackbox (0.60.3-5) unstable; urgency=low
-+
-+  * Fix for improper quoting of rootCommand
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu, 20 Jul 2000 21:41:11 -0700
-+
-+blackbox (0.60.3-4) unstable; urgency=low
-+
-+  * Bug fix release
-+  * added a CXXFLAGS setting to the rules file.  This makes blackbox smaller
-+    and faster.
-+  * Closes: #45298, #55305, #61552, #64615, #64773, #64851, #64969
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Tue, 18 Jul 2000 13:01:43 -0700
-+
-+blackbox (0.60.3-3) unstable; urgency=low
-+
-+  * Oops, left the stylesmenu file
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Sat, 27 May 2000 19:40:41 -0700
-+
-+blackbox (0.60.3-2) unstable; urgency=low
-+
-+  * Oops, left a call to update-bbstyles
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Fri, 26 May 2000 16:12:27 -0700
-+
-+blackbox (0.60.3-1) unstable; urgency=low
-+
-+  * New upstream release
-+  * Changed user style menu to look in ~/.blackbox/styles to match
-+    current practice among style authors
-+  * Cleaned up menu-method script and thus the resulting menu file it
-+    generates
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Fri, 26 May 2000 12:08:34 -0700
-+
-+blackbox (0.60.2-2) unstable; urgency=low
-+
-+  * Removed update-styles
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu, 25 May 2000 14:02:15 -0700
-+
-+blackbox (0.60.2-1) unstable; urgency=low
-+
-+  * New upstream release
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu, 25 May 2000 12:55:42 -0700
-+
-+blackbox (0.60.0.alpha-2) unstable; urgency=low
-+
-+  * New maintainer
-+
-+ -- Sean 'Shaleh' Perry <shaleh@debian.org>  Thu, 25 May 2000 11:50:49 -0700
-+
-+blackbox (0.60.0.alpha-1) unstable; urgency=low
-+
-+  * The Alpha release.
-+
-+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 22 April 2000 13:32:08 -0800
---- blackbox-0.65.0.orig/debian/conffiles
-+++ blackbox-0.65.0/debian/conffiles
-@@ -0,0 +1 @@
-+/etc/menu-methods/blackbox
---- blackbox-0.65.0.orig/debian/control
-+++ blackbox-0.65.0/debian/control
-@@ -0,0 +1,26 @@
-+Source: blackbox
-+Section: x11
-+Priority: optional
-+Build-Depends: autoconf, xlibs-dev, debhelper
-+Maintainer: Bruno Barrera C. <bruno@debian.org>
-+Standards-Version: 3.5.0
-+
-+Package: blackbox
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Provides: x-window-manager
-+Suggests: menu (>=1.5)
-+Description: Window manager for X 
-+ This is a window manager for X.  It is similar in many respects to
-+ such popular packages as Window Maker, Enlightenment, and FVWM2.  You
-+ might be interested in this package if you are tired of window managers
-+ that are a heavy drain on your system resources, but you still want
-+ an attractive and modern-looking interface.
-+ .
-+ The best part of all is that this program is coded in C++, so it
-+ is even more attractive "under the hood" than it is in service -- no
-+ small feat.
-+ .
-+ If none of this sounds familiar to you, or you want your computer to
-+ look like Microsoft Windows or Apple's OS X, you probably don't want
-+ this package.
---- blackbox-0.65.0.orig/debian/copyright
-+++ blackbox-0.65.0/debian/copyright
-@@ -0,0 +1,37 @@
-+This package was debianized by Brent A. Fulgham bfulgham@debian.org on
-+Thu, 15 Oct 1998 18:17:09 -0700.
-+
-+It was downloaded from http://sf.net/projects/blackboxwm
-+
-+Upstream Authors:   Sean 'Shaleh' Perry <shaleh@debian.org>
-+                    Brad Hughes <bhughes@trolltech.com>
-+                    Jeff Raven  <jraven@psu.edu>
-+
-+Copyright:
-+
-+The Regents of the University of California.
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS `AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- blackbox-0.65.0.orig/debian/dirs
-+++ blackbox-0.65.0/debian/dirs
-@@ -0,0 +1,10 @@
-+etc/menu-methods
-+etc/X11/blackbox
-+usr/bin
-+usr/share/man/man1
-+usr/share/doc
-+usr/share/doc/blackbox
-+usr/share/blackbox
-+usr/share/blackbox/styles
-+usr/share/blackbox/nls
-+usr/share/xsessions
---- blackbox-0.65.0.orig/debian/docs
-+++ blackbox-0.65.0/debian/docs
-@@ -0,0 +1 @@
-+AUTHORS README README.bsetbg data/README.menu data/README.style
---- blackbox-0.65.0.orig/debian/menu
-+++ blackbox-0.65.0/debian/menu
-@@ -0,0 +1,24 @@
-+?package(blackbox):needs="wm" \
-+	section="WindowManagers" title="Blackbox" \
-+  	command="/usr/bin/blackbox"
-+?package(blackbox):needs="blackbox" \
-+	section="WindowManagers" title="Exit" \
-+	command="exit"
-+?package(blackbox):needs="blackbox" \
-+	section="WindowManagers" title="Reconfigure" \
-+	command="reconfig"
-+?package(blackbox):needs="blackbox" \
-+	section="WindowManagers" title="Restart" \
-+	command="restart"
-+?package(blackbox):needs="blackbox" \
-+	section="Blackbox/Styles" title="/usr/share/blackbox/styles" \
-+	command="stylesdir"
-+?package(blackbox):needs="blackbox" \
-+	section="Blackbox/Styles" title="~/.blackbox/styles" \
-+	command="stylesdir"
-+?package(blackbox):needs="blackbox" \
-+	section="Blackbox" title="Workspaces" \
-+	command="workspaces"
-+?package(blackbox):needs="blackbox" \
-+	section="Blackbox" title="Configuration" \
-+	command="config"
---- blackbox-0.65.0.orig/debian/menu-method
-+++ blackbox-0.65.0/debian/menu-method
-@@ -0,0 +1,27 @@
-+#!/usr/sbin/install-menu
-+#
-+# Generates blackbox menus for all registered applications.
-+
-+!include menu.h
-+compat="menu-1"
-+outputencoding="LOCALE"
-+
-+genmenu="blackbox-menu"
-+rootprefix="/etc/X11/blackbox/"
-+userprefix=".blackbox/"
-+treewalk="M)"
-+
-+supported
-+    x11=   nstring(level(), "   ") "[exec] (" esc(title(), "()") ") {" esc($command, "()") "}\n" 
-+    wm=	   nstring(level(), "   ") "[restart] ("  esc(title(), "()")  ")  {" esc($command, "()") "}\n" 
-+    text=  nstring(level(), "   ") "[exec] (" esc(title(), "()") ") {"  esc(term(), "()") "}\n"
-+blackbox= nstring(level(), "   ") "[" esc($command, "()") "] (" esc(title(), "()") ")\n"
-+endsupported
-+
-+preoutput= \
-+  "# Automatically generated file. Do not edit (see /usr/share/doc/menu/README)\n\n[begin] (Debian)\n"
-+
-+startmenu= ""
-+submenutitle= nstring(level(), "   ") "[submenu] (" esc(title(),"()") ") {" esc($longtitle,"()") "}\n"
-+endmenu= nstring(level(), "   ") "[end]\n"
-+
---- blackbox-0.65.0.orig/debian/postinst
-+++ blackbox-0.65.0/debian/postinst
-@@ -0,0 +1,49 @@
-+#!/bin/sh
-+#
-+#  Blackbox postinst
-+#
-+#  Shamelessly ripped off of Marcelo Magallon's script
-+#     by Brent Fulgham <bfulgham@debian.org>
-+#
-+set -e
-+
-+WMentry="/usr/bin/blackbox"
-+
-+add_wm_entry ()
-+{
-+	update-alternatives --install /usr/bin/x-window-manager x-window-manager $WMentry 50 \
-+	--slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz /usr/share/man/man1/blackbox.1.gz
-+}
-+
-+case "$1" in
-+    configure)
-+        if [ "$2" ] && dpkg --compare-versions $2 le 0.51.3-12; then
-+	    update-alternatives --remove x-window-manager /etc/X11/window-managers
-+	fi
-+
-+        add_wm_entry
-+
-+	# clean up after eaarlier debs
-+	if [ -f /usr/share/blackbox/styles/stylesmenu ]; then
-+		rm /usr/share/blackbox/styles/stylesmenu
-+	fi
-+        
-+	if [ -f /etc/X11/blackbox/blackbox-menu ]; then
-+		rm /etc/X11/blackbox/blackbox-menu
-+	fi
-+
-+        if [ -x /usr/sbin/wm-menu-config ]; then 
-+            wm-menu-config blackbox on; 
-+        fi
-+    ;;
-+
-+    abort-upgrade|abort-deconfigure|abort-remove)
-+        # how did we get here?  Force a non-zero exit code
-+        exit 1
-+    ;;
-+
-+    *)
-+    ;;
-+esac
-+
-+#DEBHELPER#
---- blackbox-0.65.0.orig/debian/postrm
-+++ blackbox-0.65.0/debian/postrm
-@@ -0,0 +1,24 @@
-+#!/bin/sh
-+set -e
-+
-+Blackbox_entry="/usr/bin/blackbox"
-+
-+case "$1" in
-+    purge)
-+        rm -rf /etc/X11/blackbox
-+	;;
-+    remove)
-+        if [ -x /usr/sbin/wm-menu-config ]; then
-+	    wm-menu-config blackbox off
-+        fi
-+
-+        if [ -x /usr/sbin/register-window-manager ] ; then
-+	    register-window-manager --remove $Blackbox_entry
-+        fi
-+
-+        ;;
-+    *)
-+        ;;
-+esac
-+
-+#DEBHELPER#
---- blackbox-0.65.0.orig/debian/rules
-+++ blackbox-0.65.0/debian/rules
-@@ -0,0 +1,71 @@
-+#!/usr/bin/make -f
-+# MAde with the aid of dh_make, by Craig Small
-+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-+# Some lines taken from debmake, by Cristoph Lameter.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+PACKAGE=blackbox
-+
-+build: build-stamp
-+build-stamp:
-+	dh_testdir
-+	autoconf
-+	CXXFLAGS="-O2 -fno-rtti -fno-exceptions -fno-check-new" ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/X11/blackbox
-+	
-+	# Add here commands to compile the package.
-+	$(MAKE) DEFAULT_MENU=/etc/X11/blackbox/blackbox-menu
-+
-+	touch build-stamp
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp install-stamp config.log
-+
-+	# Add here commands to clean up after the build process.
-+	-$(MAKE) distclean
-+
-+	dh_clean
-+	
-+
-+install: install-stamp
-+install-stamp: build-stamp
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	# Add here commands to install the package into debian/tmp.
-+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-+	# make install places a menu here, but we don't want it
-+	rm -f `pwd`/debian/tmp/usr/share/blackbox/menu
-+	cp debian/blackbox.desktop `pwd`/debian/tmp/usr/share/xsessions/
-+	touch install-stamp
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installdocs
-+	dh_installmenu
-+	dh_installchangelogs ChangeLog
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+source diff:                                                                  
-+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary
---- blackbox-0.65.0.orig/debian/prerm
-+++ blackbox-0.65.0/debian/prerm
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+set -e
-+
-+case "$1" in
-+    remove)
-+        update-alternatives --remove x-window-manager /usr/bin/blackbox
-+	;;
-+    *)
-+        ;;
-+esac
-+
-+#DEBHELPER#
-+
---- blackbox-0.65.0.orig/debian/README.debian
-+++ blackbox-0.65.0/debian/README.debian
-@@ -0,0 +1,9 @@
-+User menus:
-+
-+When update-menus is run as a user it will create ~/.blackbox-menu.  You then
-+need to exit blackbox if it is running and edit ~/.blackboxrc.  Change the
-+line:
-+
-+session.menuFile:       /etc/X11/blackbox/blackbox-menu
-+
-+to point to the new file.
---- blackbox-0.65.0.orig/debian/blackbox.desktop
-+++ blackbox-0.65.0/debian/blackbox.desktop
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Name=Blackbox
-+Comment=Highly configurable and low resource X11 Window manager
-+Exec=blackbox
-+Terminal=False
-+TryExec=blackbox
-+Type=Application
-+
-+[Window Manager]
-+SessionManaged=true
-+
diff --git a/source/xap/blackbox/xinitrc.blackbox b/source/xap/blackbox/xinitrc.blackbox
index e5822118b..fbe0997be 100644
--- a/source/xap/blackbox/xinitrc.blackbox
+++ b/source/xap/blackbox/xinitrc.blackbox
@@ -3,8 +3,8 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
author	Patrick J Volkerding <volkerdi@slackware.com>	2010-05-19 08:58:23 +0000
committer	Eric Hameleers <alien@slackware.com>	2018-05-31 22:43:05 +0200
commit	b76270bf9e6dd375e495fec92140a79a79415d27 (patch)
tree	3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/xap/blackbox
parent	5a12e7c134274dba706667107d10d231517d3e05 (diff)
download	current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz