Update to version 20040407. Enable pkgviews installation and make good use

of PKG_SYSCONFDIR.  Thanks to Amitai Schlair.

Changes:
  * Added a kludge to deal with waitrelease when modifiers have
    already been released.
  * Fixed assert-crash when attempting to split a frame not managed
    by a WIonWS.
  * Don't put input method failure complaints in startup error log.
  * Client window unmap handling fixes (?).
  * Made drawing engine objects inheritable and initialisation code
    reusable.
  * Improvements and fixes in keyboard mapping changes handling.
  * Slightly reduce flicker with apps that update title too often by
    removing a redundant change notify call.
  * Added a check in layout loading code to detect corrupt files with
    multiple instances of the same client window.
  * Updated Mozilla Firebird entries in menu configuration files to
    Mozilla Firefox.
  * Added important missing function WFloatWS.attach.
  * Take gravity better into account when reparenting windows on
    exit.
  * Made some goto_* routines return the region that will be focused
    and added asynchronity notices in documentation.
  * Some tab drag&drop fixes.
  * Startup errorlog display fixed when we didn't even open the
    display.
  * WIonWS load routines better handle corrupt sizes in layout
    savefile.
  * Object/proxy cache references to proxies weren't being cleared
    when objects were destroyed.
  * Added exported function to get line editor 'mark'.
  * Man pages fixes
  * Fixed toggle_tab on floatframes.
  * Move/resize display was never showing position.
  * Completions display wasn't being refreshed, if its size wasn't
    changed between completions.
  * Oops, warping on workspace switch had been broken at some point.
  * Some autoconf script portability and other fixes.
  * The function floatws_current was not being exported as
    WFloatWS.current.
  * Client window focusing routine was not setting "awaiting focus"
    status.
  * Removed superfluous debugging message.
  * querylib.query_renameworkspace documentation was out-of-date.
  * Mod1+Enter full screen toggle was not mentioned on the manual
    page.

7 files changed, 31 insertions, 875 deletions

diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index a7f687ebf2a..9641405126c 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.13 2004/04/05 15:21:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/06 04:38:45 cube Exp $
 #
 
-DISTNAME=	ion-2-20040207
+DISTNAME=	ion-2-20040407
 PKGNAME=	${DISTNAME:S/-2-/-/}
-PKGREVISION=	1
 CATEGORIES=	wm x11
-MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
+MASTER_SITES=	http://modeemi.cs.tut.fi/~tuomov/ion/dl/
 
 MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://iki.fi/~tuomov/ion/
 COMMENT=	Keyboard friendly tiling window manager
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_X11=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
 PKG_SYSCONFSUBDIR=	ion
 EGDIR=			${PREFIX}/share/examples/ion
 EGFILES=		floatws.lua ion-bindings.lua ion-menus.lua	\
@@ -32,6 +35,9 @@ CONF_FILES+=		${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
 .endfor
 .undef f
 
+INSTALLATION_DIRS=	bin lib/ion libexec/ion man/man1
+INSTALLATION_DIRS+=	share/doc/ion share/examples/ion share/ion
+
 .include "../../lang/lua/buildlink3.mk"
 .include "../../devel/libtool/buildlink3.mk"
 
diff --git a/wm/ion/PLIST b/wm/ion/PLIST
index 2bc070b6973..8cc50b01c38 100644
--- a/wm/ion/PLIST
+++ b/wm/ion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/23 13:40:21 cube Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/05/06 04:38:45 cube Exp $
 bin/ion
 bin/pwm
 lib/ion/de.a
@@ -13,6 +13,11 @@ lib/ion/floatws.so
 lib/ion/ionws.a
 lib/ion/ionws.la
 lib/ion/ionws.so
+lib/ion/lc/ioncore-efbb.lc
+lib/ion/lc/ioncorelib-mplexfns.lc
+lib/ion/lc/ioncorelib.lc
+lib/ion/lc/menulib.lc
+lib/ion/lc/querylib.lc
 lib/ion/menu.a
 lib/ion/menu.la
 lib/ion/menu.so
@@ -55,17 +60,13 @@ share/ion/ion-man
 share/ion/ion-runinxterm
 share/ion/ion-ssh
 share/ion/ion-view
-share/ion/ioncore-efbb.lc
 share/ion/ioncore-efbb.lua
-share/ion/ioncorelib-mplexfns.lc
 share/ion/ioncorelib-mplexfns.lua
-share/ion/ioncorelib.lc
 share/ion/ioncorelib.lua
-share/ion/menulib.lc
 share/ion/menulib.lua
-share/ion/querylib.lc
 share/ion/querylib.lua
 share/ion/welcome_message.txt
+@dirrm lib/ion/lc
 @dirrm lib/ion
 @dirrm share/doc/ion
 @dirrm share/examples/ion
diff --git a/wm/ion/distinfo b/wm/ion/distinfo
index dffb084d036..0a2d15ebef0 100644
--- a/wm/ion/distinfo
+++ b/wm/ion/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.11 2004/02/26 05:18:14 cube Exp $
+$NetBSD: distinfo,v 1.12 2004/05/06 04:38:45 cube Exp $
 
-SHA1 (ion-2-20040207.tar.gz) = 6bbf4706b617c83fc444a244d7ef4f5f735dd8fc
-Size (ion-2-20040207.tar.gz) = 376466 bytes
-SHA1 (patch-ab) = b63395c877957621d76f57fa42e710241d5903c0
+SHA1 (ion-2-20040407.tar.gz) = 246f788bacbdf07634e779855c0715a627c55f85
+Size (ion-2-20040407.tar.gz) = 389518 bytes
 SHA1 (patch-ad) = 063d68427764a3cdde8ef52d798583d43a3f5dca
 SHA1 (patch-ae) = 1f7e6a47280ea9d7ea1bae146ea2ec6e12aa69d6
-SHA1 (patch-af) = 21abbde8e0b2bc48571c0c23999af2abc59a1390
-SHA1 (patch-ag) = fbed3e093048dbeabf444b5dd839f8e2b4118010
-SHA1 (patch-ah) = 223d75bfb6e8980467ee1501e49625a56c21cc82
+SHA1 (patch-ah) = 2e123cf133811518de31453a11ba2a1a47df440f
 SHA1 (patch-ai) = 05d9748fdbd04f5af3e89cafb69e1d060641af83
diff --git a/wm/ion/patches/patch-ab b/wm/ion/patches/patch-ab
deleted file mode 100644
index 59c3f1641b7..00000000000
--- a/wm/ion/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/02/23 13:40:21 cube Exp $
-
---- ioncore/event.c.orig	2003-03-09 12:17:40.000000000 +0100
-+++ ioncore/event.c
-@@ -15,6 +15,7 @@
- #include "readfds.h"
- 
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/time.h>
- 
diff --git a/wm/ion/patches/patch-af b/wm/ion/patches/patch-af
deleted file mode 100644
index b8709984e2d..00000000000
--- a/wm/ion/patches/patch-af
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/02/23 13:40:21 cube Exp $
-
---- configure.ac.orig	2004-02-07 16:37:01.000000000 +0100
-+++ configure.ac
-@@ -20,7 +20,7 @@ dnl }}}
- 
- dnl Checks for libraries. {{{
- AC_PATH_XTRA()
--test "${X_DISPLAY_MISSING+set}" == set && exit 1
-+test "${X_DISPLAY_MISSING+set}" = set && exit 1
- AC_CHECK_LIB([Xext],
- 			 [XMissingExtension],
- 			 [X_LIBS="$X_LIBS -lXext"],
-@@ -73,7 +73,7 @@ AC_ARG_ENABLE([Xutf8],
- 							   instead of Xmb routines in an UTF-8 locale given
- 							   the -i18n command line option])])
- 
--if test "x$enable_Xutf8" == xyes; then
-+if test "x$enable_Xutf8" = xyes; then
- 	AC_MSG_CHECKING([for Xutf8*])
- 	save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS $X_CFLAGS"
-@@ -115,7 +115,7 @@ else
- 	libtool_path="$PATH"
- fi
- AC_PATH_PROG([LIBTOOL], [libtool], [], [$libtool_path])
--test "x$LIBTOOL" == x && exit 1
-+test "x$LIBTOOL" = x && exit 1
- AC_MSG_CHECKING([for libtool version >= 1.4.3])
- libtool_version=$($LIBTOOL --version | head -n 1 | cut -d' ' -f4)
- dnl libtool_version=$($LIBTOOL --version | $EGREP -o '[0-9]+(\.[0-9]+)+' | head -n 1)
-@@ -143,7 +143,7 @@ AC_ARG_ENABLE([shared],
- 							  [Do not dynamically load modules (preload modules
- 							   instead)])])
- 
--if test "x$enable_shared" == xno; then
-+if test "x$enable_shared" = xno; then
- 	PRELOAD_MODULES="1"
- fi
- 
-@@ -173,14 +173,14 @@ AC_ARG_WITH([lua-suffix],
- dnl }}}
- 
- dnl LUA {{{
--if test "x$with_lua_prefix" == x; then
-+if test "x$with_lua_prefix" = x; then
- 	lua_search_path="$PATH"
- else
- 	lua_search_path="$with_lua_prefix/bin"
- fi
--if test "x$LUA" == x; then
-+if test "x$LUA" = x; then
- 	AC_PATH_PROG([LUA], [lua$with_lua_suffix], [], [$lua_search_path])
--	test "x$LUA" == x && exit 1
-+	test "x$LUA" = x && exit 1
- fi
- dnl }}}
- 
-@@ -200,16 +200,16 @@ esac
- dnl }}}
- 
- dnl LUAC {{{
--if test "x$LUAC" == x; then
-+if test "x$LUAC" = x; then
- 	AC_PATH_PROG([LUAC], [luac$with_lua_suffix], [], [$lua_search_path])
--	test "x$LUAC" == x && exit 1
-+	test "x$LUAC" = x && exit 1
- fi
- dnl }}}
- 
- dnl luac_version {{{
- AC_MSG_CHECKING([for lua version == luac version])
- luac_version=$($LUAC -v 2>&1 | head -n 1 | cut -d' ' -f2)
--if test "x$lua_version" == "x$luac_version"; then
-+if test "x$lua_version" = "x$luac_version"; then
- 	AC_MSG_RESULT([yes (found $luac_version)])
- else
- 	AC_MSG_RESULT([no (found $luac_version)])
-@@ -301,7 +301,7 @@ AC_ARG_ENABLE([xopen-source],
- 			  [AS_HELP_STRING([--enable-xopen-source],
- 							  [Enable X/Open C flags (development use only)])])
- 
--if test "x$enable_xopen_source" == xyes; then
-+if test "x$enable_xopen_source" = xyes; then
- 	AC_MSG_CHECKING([for $CC flags to accept X/Open C])
- 	case $host in
- 	# FIXME: what flags are required for other hosts/compilers?
-@@ -325,7 +325,7 @@ AC_ARG_ENABLE([c99-source],
- 			  [AS_HELP_STRING([--enable-c99-source],
- 							  [Enable C99 source (development use only)])])
- 
--if test "x$enable_c99_source" == xyes; then
-+if test "x$enable_c99_source" = xyes; then
- 	AC_MSG_CHECKING([for $CC flags to accept C99])
- 	case $CC in
- 	# FIXME: what flags are required for other hosts/compilers?
-@@ -428,7 +428,7 @@ dnl }}}
- 
- AC_OUTPUT([system-ac.mk])
- 
--if test "x$lua_version" == "x5.0"; then
-+if test "x$lua_version" = "x5.0"; then
- 	AC_MSG_NOTICE([**])
- 	AC_MSG_NOTICE([** lua version 5.0 is buggy, consider upgrading to 5.0.1])
- 	AC_MSG_NOTICE([** see http://lua-users.org/lists/lua-l/2003-10/msg00039.html])
diff --git a/wm/ion/patches/patch-ag b/wm/ion/patches/patch-ag
deleted file mode 100644
index 8a9c09e4873..00000000000
--- a/wm/ion/patches/patch-ag
+++ /dev/null
@@ -1,727 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/02/23 13:40:21 cube Exp $
-
---- configure.orig	2004-02-07 16:37:04.000000000 +0100
-+++ configure
-@@ -848,50 +848,36 @@ if test -n "$ac_init_help"; then
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --disable-xinerama
--                          Disable Xinerama support
-+  --disable-xinerama      Disable Xinerama support
-   --disable-xfree86-textprop-bug-workaround
-                           Disable the XFree86 textprop bug workaround
--  --enable-Xutf8
--                          Use the Xutf8 routines (XFree86 extension) instead of
--                          Xmb routines in an UTF-8 locale given the -i18n
-+  --enable-Xutf8          Use the Xutf8 routines (XFree86 extension) instead
-+                          of Xmb routines in an UTF-8 locale given the -i18n
-                           command line option
--  --disable-shared
--                          Do not dynamically load modules (preload modules instead)
--  --enable-xopen-source
--                          Enable X/Open C flags (development use only)
--  --enable-c99-source
--                          Enable C99 source (development use only)
-+  --disable-shared        Do not dynamically load modules (preload modules
-+                          instead)
-+  --enable-xopen-source   Enable X/Open C flags (development use only)
-+  --enable-c99-source     Enable C99 source (development use only)
- 
- 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
--  --with-libtool=DIR
--                          Libtool files are in DIR
--  --with-lua-prefix=DIR
--                          Lua files are in DIR
--  --with-lua-includes=DIR
--                          Lua include files are in DIR
-+  --with-libtool=DIR      Libtool files are in DIR
-+  --with-lua-prefix=DIR   Lua files are in DIR
-+  --with-lua-includes=DIR Lua include files are in DIR
-   --with-lua-libraries=DIR
-                           Lua library files are in DIR
--  --with-lua-suffix=ARG
--                          Lua binary and library files are suffixed with
--                          ARG
-+  --with-lua-suffix=ARG   Lua binary and library files are suffixed with ARG
- 
- 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>
--  CPP
--              C preprocessor
-+  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>
-+  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.
-@@ -930,43 +916,40 @@ case $srcdir in
-     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=$ac_builddir;;
- *)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  case $ac_builddir in
-+  .) ac_abs_builddir="$ac_dir";;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
-+  *) ac_abs_builddir="$ac_dir"/$ac_builddir;;
-   esac;;
- esac
--case $ac_abs_builddir in
-+case "$ac_dir" 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_dir";;
-   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
-   esac;;
- esac
--case $ac_abs_builddir in
-+case "$ac_dir" in
- .) ac_abs_srcdir=$ac_srcdir;;
- *)
-   case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  .) ac_abs_srcdir="$ac_dir";;
-   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
-   esac;;
- esac
--case $ac_abs_builddir in
-+case "$ac_dir" 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_dir";;
-   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
-   esac;;
- esac
- 
-@@ -985,7 +968,7 @@ esac
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -1913,7 +1896,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -1971,7 +1955,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -2087,7 +2072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -2141,7 +2127,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -2186,7 +2173,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -2230,7 +2218,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -3033,7 +3022,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3144,7 +3134,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3195,7 +3186,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3271,7 +3263,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3326,7 +3319,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3394,7 +3388,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3502,7 +3497,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3566,7 +3562,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3634,7 +3631,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3738,7 +3736,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3802,7 +3801,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3899,7 +3899,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -3963,7 +3964,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4060,7 +4062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4124,7 +4127,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4203,7 +4207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4236,7 +4241,7 @@ fi
- 
- fi
- 
--test "${X_DISPLAY_MISSING+set}" == set && exit 1
-+test "${X_DISPLAY_MISSING+set}" = set && exit 1
- echo "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5
- echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6
- if test "${ac_cv_lib_Xext_XMissingExtension+set}" = set; then
-@@ -4275,7 +4280,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4356,7 +4362,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4415,7 +4422,7 @@ if test "${enable_Xutf8+set}" = set; the
- 
- fi;
- 
--if test "x$enable_Xutf8" == xyes; then
-+if test "x$enable_Xutf8" = xyes; then
- 	echo "$as_me:$LINENO: checking for Xutf8*" >&5
- echo $ECHO_N "checking for Xutf8*... $ECHO_C" >&6
- 	save_CFLAGS="$CFLAGS"
-@@ -4533,7 +4540,7 @@ else
- echo "${ECHO_T}no" >&6
- fi
- 
--test "x$LIBTOOL" == x && exit 1
-+test "x$LIBTOOL" = x && exit 1
- echo "$as_me:$LINENO: checking for libtool version >= 1.4.3" >&5
- echo $ECHO_N "checking for libtool version >= 1.4.3... $ECHO_C" >&6
- libtool_version=$($LIBTOOL --version | head -n 1 | cut -d' ' -f4)
-@@ -4573,7 +4580,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -4641,7 +4649,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -4683,7 +4692,7 @@ if test "${enable_shared+set}" = set; th
- 
- fi;
- 
--if test "x$enable_shared" == xno; then
-+if test "x$enable_shared" = xno; then
- 	PRELOAD_MODULES="1"
- fi
- 
-@@ -4719,12 +4728,12 @@ if test "${with_lua_suffix+set}" = set; 
- 
- fi;
- 
--if test "x$with_lua_prefix" == x; then
-+if test "x$with_lua_prefix" = x; then
- 	lua_search_path="$PATH"
- else
- 	lua_search_path="$with_lua_prefix/bin"
- fi
--if test "x$LUA" == x; then
-+if test "x$LUA" = x; then
- 	# Extract the first word of "lua$with_lua_suffix", so it can be a program name with args.
- set dummy lua$with_lua_suffix; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -4764,7 +4773,7 @@ else
- echo "${ECHO_T}no" >&6
- fi
- 
--	test "x$LUA" == x && exit 1
-+	test "x$LUA" = x && exit 1
- fi
- 
- echo "$as_me:$LINENO: checking for lua version >= 5.0" >&5
-@@ -4782,7 +4791,7 @@ echo "${ECHO_T}yes (found $lua_version)"
- 	;;
- esac
- 
--if test "x$LUAC" == x; then
-+if test "x$LUAC" = x; then
- 	# Extract the first word of "luac$with_lua_suffix", so it can be a program name with args.
- set dummy luac$with_lua_suffix; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -4822,13 +4831,13 @@ else
- echo "${ECHO_T}no" >&6
- fi
- 
--	test "x$LUAC" == x && exit 1
-+	test "x$LUAC" = x && exit 1
- fi
- 
- echo "$as_me:$LINENO: checking for lua version == luac version" >&5
- echo $ECHO_N "checking for lua version == luac version... $ECHO_C" >&6
- luac_version=$($LUAC -v 2>&1 | head -n 1 | cut -d' ' -f2)
--if test "x$lua_version" == "x$luac_version"; then
-+if test "x$lua_version" = "x$luac_version"; then
- 	echo "$as_me:$LINENO: result: yes (found $luac_version)" >&5
- echo "${ECHO_T}yes (found $luac_version)" >&6
- else
-@@ -4877,7 +4886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -5047,7 +5057,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -5115,7 +5126,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -5278,7 +5290,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5347,7 +5360,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5414,7 +5428,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5482,7 +5497,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5650,7 +5666,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5740,7 +5757,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5781,7 +5799,7 @@ if test "${enable_xopen_source+set}" = s
- 
- fi;
- 
--if test "x$enable_xopen_source" == xyes; then
-+if test "x$enable_xopen_source" = xyes; then
- 	echo "$as_me:$LINENO: checking for $CC flags to accept X/Open C" >&5
- echo $ECHO_N "checking for $CC flags to accept X/Open C... $ECHO_C" >&6
- 	case $host in
-@@ -5807,7 +5825,7 @@ if test "${enable_c99_source+set}" = set
- 
- fi;
- 
--if test "x$enable_c99_source" == xyes; then
-+if test "x$enable_c99_source" = xyes; then
- 	echo "$as_me:$LINENO: checking for $CC flags to accept C99" >&5
- echo $ECHO_N "checking for $CC flags to accept C99... $ECHO_C" >&6
- 	case $CC in
-@@ -5935,7 +5953,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -5997,7 +6016,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -6134,7 +6154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   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'
-+	 { 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=$?
-@@ -6306,7 +6327,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   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'
-+	 { 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=$?
-@@ -7140,43 +7162,40 @@ case $srcdir in
-     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=$ac_builddir;;
- *)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+  case $ac_builddir in
-+  .) ac_abs_builddir="$ac_dir";;
-+  [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
-+  *) ac_abs_builddir="$ac_dir"/$ac_builddir;;
-   esac;;
- esac
--case $ac_abs_builddir in
-+case "$ac_dir" 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_dir";;
-   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+  *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
-   esac;;
- esac
--case $ac_abs_builddir in
-+case "$ac_dir" in
- .) ac_abs_srcdir=$ac_srcdir;;
- *)
-   case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
-+  .) ac_abs_srcdir="$ac_dir";;
-   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+  *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
-   esac;;
- esac
--case $ac_abs_builddir in
-+case "$ac_dir" 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_dir";;
-   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+  *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
-   esac;;
- esac
- 
-@@ -7186,6 +7205,11 @@ esac
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -7224,12 +7248,6 @@ echo "$as_me: error: cannot find input f
- 	 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
-@@ -7290,7 +7308,7 @@ if test "$no_create" != yes; then
- fi
- 
- 
--if test "x$lua_version" == "x5.0"; then
-+if test "x$lua_version" = "x5.0"; then
- 	{ echo "$as_me:$LINENO: **" >&5
- echo "$as_me: **" >&6;}
- 	{ echo "$as_me:$LINENO: ** lua version 5.0 is buggy, consider upgrading to 5.0.1" >&5
diff --git a/wm/ion/patches/patch-ah b/wm/ion/patches/patch-ah
index 5ce84ce3386..67b1662c9c3 100644
--- a/wm/ion/patches/patch-ah
+++ b/wm/ion/patches/patch-ah
@@ -1,8 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2004/02/23 13:40:21 cube Exp $
+$NetBSD: patch-ah,v 1.2 2004/05/06 04:38:45 cube Exp $
 
---- system-ac.mk.in.orig	2004-01-27 14:49:08.000000000 +0100
+--- system-ac.mk.in.orig	2004-04-02 03:17:08.000000000 -0500
 +++ system-ac.mk.in
-@@ -20,7 +20,7 @@ ETCDIR=@sysconfdir@/@PACKAGE_TARNAME@
+@@ -16,11 +16,11 @@ exec_prefix=@exec_prefix@
+ # Main binaries
+ BINDIR=@bindir@
+ # Configuration .lua files
+-ETCDIR=@sysconfdir@/@PACKAGE_TARNAME@
++ETCDIR=@sysconfdir@
  # Some .lua files and ion-* shell scripts
  SHAREDIR=@datadir@/@PACKAGE_TARNAME@
  # Manual pages
@@ -11,20 +16,11 @@ $NetBSD: patch-ah,v 1.1 2004/02/23 13:40:21 cube Exp $
  # Some documents
  DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
  # Nothing at the moment
-@@ -31,6 +31,7 @@ LIBDIR=@libdir@
- MODULEDIR=@libdir@/@PACKAGE_TARNAME@
+@@ -33,6 +33,7 @@ MODULEDIR=@libdir@/@PACKAGE_TARNAME@
+ LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
  # ion-completefile (does not belong in SHAREDIR being a binary file)
  EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
 +EXDIR=@datadir@/examples/@PACKAGE_TARNAME@
  
  ##
  ## Modules
-@@ -163,7 +164,7 @@ C99_SOURCE=@C99_SOURCE@
- DEFINES += @_DCF_HAS_VA_COPY@
- 
- CFLAGS=@CFLAGS@ $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
--LDFLAGS=@CFLAGS@ $(LIBS) $(EXTRA_LIBS)
-+LDFLAGS=@LDFLAGS@ $(LIBS) $(EXTRA_LIBS)
- 
- 
- ##