Initial import of ion3, the development version of the Ion window

manager, into the NetBSD Packages Collection.

ion3-devel will eventually become ion3 when it is stable.  It can be
installed independently from ion2, allowing one to test ion3 and still
keep ion2 around.

13 files changed, 1288 insertions, 0 deletions

diff --git a/wm/ion3-devel/DESCR b/wm/ion3-devel/DESCR
new file mode 100644
index 00000000000..0653e86618f
--- /dev/null
+++ b/wm/ion3-devel/DESCR
@@ -0,0 +1,3 @@
+Ion is a window manager dividing the screen into frames rather than having
+overlapping windows, much like the windows in Emacs.  Navigation between
+clients can be done solely using the keyboard without need for a mouse.
diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
new file mode 100644
index 00000000000..fb68744e24b
--- /dev/null
+++ b/wm/ion3-devel/Makefile
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+#
+
+DISTNAME=	ion-3ds-20040906
+PKGNAME=	${DISTNAME:S/-3ds-/3-/}
+CATEGORIES=	wm x11
+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
+USE_PKGLOCALEDIR=	YES
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
+
+PKG_SYSCONFSUBDIR=	ion3
+EGDIR=			${PREFIX}/share/examples/ion3
+EGFILES=		cfg_bindings.lua cfg_dock.lua cfg_floatws.lua	\
+			cfg_ion.lua cfg_ionws.lua cfg_kludges.lua	\
+			cfg_menu.lua cfg_menus.lua cfg_panews.lua	\
+			cfg_pwm.lua cfg_pwm_bindings.lua		\
+			cfg_pwm_menus.lua cfg_query.lua cfg_sp.lua	\
+			cfg_statusbar.lua				\
+			dock-draw.lua look.lua look_brownsteel.lua	\
+			look_clean.lua look_cleanios.lua		\
+			look_cleanviolet.lua look_dusky.lua		\
+			look_greyviolet.lua look_ios.lua		\
+			look_simpleblue.lua look_wheat2.lua
+.for f in ${EGFILES}
+CONF_FILES+=		${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+
+# This is necessary because gettext's builtin.mk add stuff there,
+# and ion3's autoconf is rather broken in the way it auto-configures
+# itself for gettext.  Eventually ion3 should be fixed, but right now
+# it is not really possible.
+LIBS=
diff --git a/wm/ion3-devel/PLIST b/wm/ion3-devel/PLIST
new file mode 100644
index 00000000000..0323fd1a4ec
--- /dev/null
+++ b/wm/ion3-devel/PLIST
@@ -0,0 +1,84 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+bin/ion3
+bin/pwm3
+lib/ion3/lc/de.lc
+lib/ion3/lc/ext_statusbar.lc
+lib/ion3/lc/ioncore-bindings.lc
+lib/ion3/lc/ioncore-efbb.lc
+lib/ion3/lc/ioncore-ext.lc
+lib/ion3/lc/ioncore-luaext.lc
+lib/ion3/lc/ioncore-misc.lc
+lib/ion3/lc/ioncore-winprops.lc
+lib/ion3/lc/mod_dock.lc
+lib/ion3/lc/mod_floatws.lc
+lib/ion3/lc/mod_ionws.lc
+lib/ion3/lc/mod_menu.lc
+lib/ion3/lc/mod_panews.lc
+lib/ion3/lc/mod_query.lc
+lib/ion3/lc/mod_sm.lc
+lib/ion3/lc/mod_sp.lc
+lib/ion3/mod/de.so
+lib/ion3/mod/mod_dock.so
+lib/ion3/mod/mod_floatws.so
+lib/ion3/mod/mod_ionws.so
+lib/ion3/mod/mod_menu.so
+lib/ion3/mod/mod_panews.so
+lib/ion3/mod/mod_query.so
+lib/ion3/mod/mod_sm.so
+lib/ion3/mod/mod_sp.so
+libexec/ion3/bin/ion-completefile
+man/cs/man1/ion3.1
+man/cs/man1/pwm3.1
+man/fi/man1/ion3.1
+man/fi/man1/pwm3.1
+man/man1/ion3.1
+man/man1/pwm3.1
+share/doc/ion3/ChangeLog
+share/doc/ion3/LICENSE
+share/doc/ion3/README
+share/doc/ion3/RELNOTES
+share/examples/ion3/cfg_bindings.lua
+share/examples/ion3/cfg_dock.lua
+share/examples/ion3/cfg_floatws.lua
+share/examples/ion3/cfg_ion.lua
+share/examples/ion3/cfg_ionws.lua
+share/examples/ion3/cfg_kludges.lua
+share/examples/ion3/cfg_menu.lua
+share/examples/ion3/cfg_menus.lua
+share/examples/ion3/cfg_panews.lua
+share/examples/ion3/cfg_pwm.lua
+share/examples/ion3/cfg_pwm_bindings.lua
+share/examples/ion3/cfg_pwm_menus.lua
+share/examples/ion3/cfg_query.lua
+share/examples/ion3/cfg_sp.lua
+share/examples/ion3/cfg_statusbar.lua
+share/examples/ion3/dock-draw.lua
+share/examples/ion3/look.lua
+share/examples/ion3/look_brownsteel.lua
+share/examples/ion3/look_clean.lua
+share/examples/ion3/look_cleanios.lua
+share/examples/ion3/look_cleanviolet.lua
+share/examples/ion3/look_dusky.lua
+share/examples/ion3/look_greyviolet.lua
+share/examples/ion3/look_ios.lua
+share/examples/ion3/look_simpleblue.lua
+share/examples/ion3/look_wheat2.lua
+share/ion3/ion-completeman
+share/ion3/ion-edit
+share/ion3/ion-man
+share/ion3/ion-runinxterm
+share/ion3/ion-ssh
+share/ion3/ion-view
+share/ion3/welcome.cs.txt
+share/ion3/welcome.fi.txt
+share/ion3/welcome.txt
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/ion3.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/ion3.mo
+@dirrm share/ion3
+@dirrm share/examples/ion3
+@dirrm share/doc/ion3
+@dirrm libexec/ion3/bin
+@dirrm libexec/ion3
+@dirrm lib/ion3/mod
+@dirrm lib/ion3/lc
+@dirrm lib/ion3
diff --git a/wm/ion3-devel/distinfo b/wm/ion3-devel/distinfo
new file mode 100644
index 00000000000..56f951c95ca
--- /dev/null
+++ b/wm/ion3-devel/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+SHA1 (ion-3ds-20040906.tar.gz) = 56f74e8bec7861488b3339183cf20f9bb15e5691
+Size (ion-3ds-20040906.tar.gz) = 515278 bytes
+SHA1 (patch-aa) = ad7d6038f48953d1bc1243a056e60aae37943233
+SHA1 (patch-ab) = ecd1804c8fb4c1b7591b004e941e36c94777852f
+SHA1 (patch-ac) = db04fbd865a61104ebb6f023424f22ecbc763ae3
+SHA1 (patch-ad) = 059a97ed0fedc47a58a3998a358f8fe117cd8255
+SHA1 (patch-ae) = f31da4c0c6e15ea32e2c70a0f9293ec25bd521b0
+SHA1 (patch-af) = 0189a36cb5baa3c5c6468103c80df25cd7936903
+SHA1 (patch-ag) = 6ee3eba8031e7b3ee674b52a171feeb595fad04d
+SHA1 (patch-ah) = 15efb122f2a54919d0dc4db3d95c4f89c02db361
+SHA1 (patch-ai) = 0d2e440163caceb8e5dd7a88548569083cd16653
diff --git a/wm/ion3-devel/patches/patch-aa b/wm/ion3-devel/patches/patch-aa
new file mode 100644
index 00000000000..fceb3b6fb3c
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-aa
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+--- configure.ac.orig	2004-09-06 20:28:34.000000000 +0200
++++ configure.ac
+@@ -106,7 +106,7 @@ AC_ARG_ENABLE([sun-f1x-remap],
+ 			  [AS_HELP_STRING([--enable-sun-f1x-remap],
+ 							  [Remap F11 key to SunF36 and F12 to SunF37])])
+ 
+-if test "x$enable_sun_f1x_remap" == xyes; then
++if test "x$enable_sun_f1x_remap" = xyes; then
+ 	_DCF_SUN_F1X_REMAP="1"
+ fi
+ 
+@@ -117,7 +117,18 @@ dnl DL_LIBS {{{
+ AC_SUBST([DL_LIBS])
+ 
+ AC_CHECK_HEADER([dlfcn.h], [], [exit 1])
+-AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [exit 1])
++AC_CHECK_FUNCS([dlopen], [], [
++	AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [exit 1])])
++
++dnl }}}
++
++dnl INTL_LIBS {{{
++
++AC_SUBST([INTL_LIBS])
++
++AC_CHECK_HEADER([libintl.h], [], [exit 1])
++AC_CHECK_FUNCS([gettext], [], [
++	AC_CHECK_LIB([intl], [gettext], [INTL_LIBS="-lintl"], [exit 1])])
+ 
+ dnl }}}
+ 
+@@ -406,12 +417,13 @@ AC_ARG_ENABLE([locale],
+ 			  [AS_HELP_STRING([--disable-locale],
+ 							  [Disable locale support])])
+ 
+-if test "x$enable_locale" == xno; then
++if test "x$enable_locale" = xno; then
+ 	_DCF_NO_LOCALE="-DCF_NO_LOCALE"
+ fi
+ 
+ dnl }}}
+ 
++AC_SUBST(PKGLOCALEDIR)
+ 
+ AC_OUTPUT([system-ac.mk])
+ 
diff --git a/wm/ion3-devel/patches/patch-ab b/wm/ion3-devel/patches/patch-ab
new file mode 100644
index 00000000000..84f3563f580
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ab
@@ -0,0 +1,931 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/10/04 20:50:58 cube Exp $
+
+--- configure.orig	2004-09-06 20:28:37.000000000 +0200
++++ configure
+@@ -311,7 +311,7 @@ ac_includes_default="\
+ # 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP AR ac_ct_AR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINERAMA_LIBS _DCF_NO_XINERAMA _DCF_XFREE86_TEXTPROP_BUG_WORKAROUND _DCF_DE_USE_XUTF8 _DCF_SUN_F1X_REMAP DL_LIBS PRELOAD_MODULES LUA LUAC LUA_INCLUDES LUA_LIBS HAS_SYSTEM_ASPRINTF XOPEN_SOURCE C99_SOURCE _DCF_HAS_VA_COPY _DCF_NO_LOCALE LIBOBJS LTLIBOBJS'
++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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP AR ac_ct_AR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINERAMA_LIBS _DCF_NO_XINERAMA _DCF_XFREE86_TEXTPROP_BUG_WORKAROUND _DCF_DE_USE_XUTF8 _DCF_SUN_F1X_REMAP DL_LIBS INTL_LIBS PRELOAD_MODULES LUA LUAC LUA_INCLUDES LUA_LIBS HAS_SYSTEM_ASPRINTF XOPEN_SOURCE C99_SOURCE _DCF_HAS_VA_COPY _DCF_NO_LOCALE PKGLOCALEDIR LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -972,7 +972,7 @@ esac
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+-    cd "$ac_popdir"
++    cd $ac_popdir
+   done
+ fi
+ 
+@@ -1900,7 +1900,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=$?
+@@ -1958,7 +1959,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=$?
+@@ -2074,7 +2076,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=$?
+@@ -2128,7 +2131,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=$?
+@@ -2173,7 +2177,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=$?
+@@ -2217,7 +2222,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=$?
+@@ -2851,12 +2857,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-
+-if test "x$ac_path_x_has_been_run" != xyes; then
+-  echo "$as_me:$LINENO: checking for X" >&5
++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
+@@ -2949,7 +2952,7 @@ ac_x_header_dirs='
+ /usr/openwin/share/include'
+ 
+ if test "$ac_x_includes" = no; then
+-  # Guess where to find include files, by looking for a specified header file.
++  # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3023,7 +3026,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=$?
+@@ -3083,15 +3087,10 @@ else
+   # 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
++  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
++echo "${ECHO_T}libraries $x_libraries, headers $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.
+ 
+@@ -3139,7 +3138,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=$?
+@@ -3190,7 +3190,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=$?
+@@ -3266,7 +3267,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=$?
+@@ -3321,7 +3323,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=$?
+@@ -3389,7 +3392,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=$?
+@@ -3497,7 +3501,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=$?
+@@ -3561,7 +3566,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=$?
+@@ -3629,7 +3635,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=$?
+@@ -3733,7 +3740,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=$?
+@@ -3797,7 +3805,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=$?
+@@ -3894,7 +3903,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=$?
+@@ -3958,7 +3968,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=$?
+@@ -4055,7 +4066,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=$?
+@@ -4119,7 +4131,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=$?
+@@ -4198,7 +4211,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=$?
+@@ -4270,7 +4284,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=$?
+@@ -4351,7 +4366,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=$?
+@@ -4480,7 +4496,7 @@ if test "${enable_sun_f1x_remap+set}" = 
+ 
+ fi;
+ 
+-if test "x$enable_sun_f1x_remap" == xyes; then
++if test "x$enable_sun_f1x_remap" = xyes; then
+ 	_DCF_SUN_F1X_REMAP="1"
+ fi
+ 
+@@ -4521,7 +4537,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=$?
+@@ -4691,7 +4708,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=$?
+@@ -4754,7 +4772,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=$?
+@@ -4867,7 +4886,108 @@ else
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++
++for ac_func in dlopen
++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 ();
++/* 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 dlopen in -ldl" >&5
+ echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4905,7 +5025,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=$?
+@@ -4936,6 +5057,332 @@ else
+   exit 1
+ fi
+ 
++fi
++done
++
++
++
++
++
++
++if test "${ac_cv_header_libintl_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for libintl.h" >&5
++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
++if test "${ac_cv_header_libintl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking libintl.h usability" >&5
++echo $ECHO_N "checking libintl.h 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 <libintl.h>
++_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 libintl.h presence" >&5
++echo $ECHO_N "checking libintl.h 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 <libintl.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
++  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: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ---------------------------- ##
++## Report this to tuomov@iki.fi ##
++## ---------------------------- ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for libintl.h" >&5
++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
++if test "${ac_cv_header_libintl_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_libintl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
++
++fi
++if test $ac_cv_header_libintl_h = yes; then
++  :
++else
++  exit 1
++fi
++
++
++
++for ac_func in gettext
++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 ();
++/* 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 gettext in -lintl" >&5
++echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6
++if test "${ac_cv_lib_intl_gettext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl  $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 gettext ();
++int
++main ()
++{
++gettext ();
++  ;
++  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_intl_gettext=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_intl_gettext=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_intl_gettext" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
++if test $ac_cv_lib_intl_gettext = yes; then
++  INTL_LIBS="-lintl"
++else
++  exit 1
++fi
++
++fi
++done
++
+ 
+ 
+ 
+@@ -5143,7 +5590,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=$?
+@@ -5306,7 +5754,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=$?
+@@ -5375,7 +5824,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=$?
+@@ -5442,7 +5892,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=$?
+@@ -5510,7 +5961,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=$?
+@@ -5678,7 +6130,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=$?
+@@ -5768,7 +6221,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=$?
+@@ -5963,7 +6417,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=$?
+@@ -6000,12 +6455,13 @@ if test "${enable_locale+set}" = set; th
+ 
+ fi;
+ 
+-if test "x$enable_locale" == xno; then
++if test "x$enable_locale" = xno; then
+ 	_DCF_NO_LOCALE="-DCF_NO_LOCALE"
+ fi
+ 
+ 
+ 
++
+           ac_config_files="$ac_config_files system-ac.mk"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -6670,6 +7126,7 @@ s,@_DCF_XFREE86_TEXTPROP_BUG_WORKAROUND@
+ s,@_DCF_DE_USE_XUTF8@,$_DCF_DE_USE_XUTF8,;t t
+ s,@_DCF_SUN_F1X_REMAP@,$_DCF_SUN_F1X_REMAP,;t t
+ s,@DL_LIBS@,$DL_LIBS,;t t
++s,@INTL_LIBS@,$INTL_LIBS,;t t
+ s,@PRELOAD_MODULES@,$PRELOAD_MODULES,;t t
+ s,@LUA@,$LUA,;t t
+ s,@LUAC@,$LUAC,;t t
+@@ -6680,6 +7137,7 @@ s,@XOPEN_SOURCE@,$XOPEN_SOURCE,;t t
+ s,@C99_SOURCE@,$C99_SOURCE,;t t
+ s,@_DCF_HAS_VA_COPY@,$_DCF_HAS_VA_COPY,;t t
+ s,@_DCF_NO_LOCALE@,$_DCF_NO_LOCALE,;t t
++s,@PKGLOCALEDIR@,$PKGLOCALEDIR,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+@@ -6848,6 +7306,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.  */
+@@ -6886,12 +7349,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
diff --git a/wm/ion3-devel/patches/patch-ac b/wm/ion3-devel/patches/patch-ac
new file mode 100644
index 00000000000..d05a992db74
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/10/04 20:50:58 cube Exp $
+
+--- etc/Makefile.orig	2004-09-06 20:28:36.000000000 +0200
++++ etc/Makefile
+@@ -22,5 +22,5 @@ include $(TOPDIR)/rules.mk
+ ######################################
+ 
+ _install: etc_install
+-	rm -f $(ETCDIR)/look.lua
+-	ln -s look_cleanviolet.lua $(ETCDIR)/look.lua
++	rm -f $(EXDIR)/look.lua
++	ln -s look_cleanviolet.lua $(EXDIR)/look.lua
diff --git a/wm/ion3-devel/patches/patch-ad b/wm/ion3-devel/patches/patch-ad
new file mode 100644
index 00000000000..d178e7b307d
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ad
@@ -0,0 +1,45 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+--- ext_statusbar/ext_statusbar.lua.orig	2004-08-15 03:40:35.000000000 +0200
++++ ext_statusbar/ext_statusbar.lua
+@@ -102,7 +102,7 @@ end
+ local function get_load_uptime()
+     local f=io.popen('uptime', 'r')
+     if not f then
+-        return "??"
++        return ""
+     end
+     local s=f:read('*l')
+     f:close()
+@@ -110,11 +110,30 @@ local function get_load_uptime()
+     return (load or "")
+ end
+ 
++local function get_load_sysctl()
++    local f=io.popen('sysctl -n vm.loadavg', 'r')
++    if not f then
++        return ""
++    end
++    local s=f:read('*l')
++    f:close()
++    local st, en, load=string.find(s, '^(%d+%.%d+) %d+%.%d+ %d+%.%d+$')
++    return (load or "")
++end
++
++local function get_load_na()
++    return "(n/a)"
++end
++
+ local function detect_load_fn()
+     if get_load_proc()~="" then
+         return get_load_proc
+-    else
++    elseif get_load_uptime()~="" then
+         return get_load_uptime
++    elseif get_load_sysctl()~="" then
++        return get_load_sysctl
++    else
++        return get_load_na
+     end
+ end
+ 
diff --git a/wm/ion3-devel/patches/patch-ae b/wm/ion3-devel/patches/patch-ae
new file mode 100644
index 00000000000..a2e87765aab
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+--- ion/Makefile.orig	2004-09-06 20:28:36.000000000 +0200
++++ ion/Makefile
+@@ -18,6 +18,7 @@ LIBS += -lm
+ LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
+ LIBS += $(LUA_LIBS)
+ LIBS += $(DL_LIBS)
++LIBS += $(INTL_LIBS)
+ EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
+ EXT_OBJS += ../libtu/libtu.a
+ 
diff --git a/wm/ion3-devel/patches/patch-af b/wm/ion3-devel/patches/patch-af
new file mode 100644
index 00000000000..57c7c54284b
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+--- mod_dock/Makefile.orig	2004-09-06 20:28:36.000000000 +0200
++++ mod_dock/Makefile
+@@ -28,9 +28,9 @@ include $(TOPDIR)/rules.mk
+ ######################################
+ 
+ _install: module_install
+-	$(INSTALLDIR) $(ETCDIR)
++	$(INSTALLDIR) $(EXDIR)
+ 	for i in $(ETC); do \
+-		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
++		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
+ 	done
+ 
+ ######################################
diff --git a/wm/ion3-devel/patches/patch-ag b/wm/ion3-devel/patches/patch-ag
new file mode 100644
index 00000000000..0671e8a6b47
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+--- pwm/Makefile.orig	2004-09-06 20:28:36.000000000 +0200
++++ pwm/Makefile
+@@ -18,6 +18,7 @@ LIBS += -lm
+ LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
+ LIBS += $(LUA_LIBS)
+ LIBS += $(DL_LIBS)
++LIBS += $(INTL_LIBS)
+ EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
+ EXT_OBJS += ../libtu/libtu.a
+ 
+@@ -26,7 +27,7 @@ DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAR
+ 	   -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+ 
+ ifndef PWM_ETCDIR
+-PWM_ETCDIR = $(ETCDIR)
++PWM_ETCDIR = $(EXDIR)
+ else
+ DEFINES += -DPWM_ETCDIR=\"$(PWM_ETCDIR)\"
+ endif
diff --git a/wm/ion3-devel/patches/patch-ah b/wm/ion3-devel/patches/patch-ah
new file mode 100644
index 00000000000..b5ccdfaac22
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/10/04 20:50:58 cube Exp $
+
+--- rules.mk.orig	2004-09-06 20:28:36.000000000 +0200
++++ rules.mk
+@@ -144,9 +144,9 @@ lc_install:
+ 	done
+ 
+ etc_install:
+-	$(INSTALLDIR) $(ETCDIR)
++	$(INSTALLDIR) $(EXDIR)
+ 	for i in $(ETC); do \
+-		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
++		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
+ 	done
+ 
+ # Dependencies
diff --git a/wm/ion3-devel/patches/patch-ai b/wm/ion3-devel/patches/patch-ai
new file mode 100644
index 00000000000..dffdc8a21b7
--- /dev/null
+++ b/wm/ion3-devel/patches/patch-ai
@@ -0,0 +1,36 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
+
+--- system-ac.mk.in.orig	2004-09-06 20:25:27.000000000 +0200
++++ system-ac.mk.in
+@@ -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
+-MANDIR=@datadir@/man
++MANDIR=@prefix@/man
+ # Some documents
+ DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
+ # Nothing at the moment
+@@ -37,7 +37,8 @@ EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAM
+ #VARDIR=@localstatedir@/cache/@PACKAGE_TARNAME@
+ VARDIR=/var/cache/@PACKAGE_TARNAME@
+ # Message catalogs
+-LOCALEDIR=@prefix@/share/locale
++LOCALEDIR=@PKGLOCALEDIR@
++EXDIR=@datadir@/examples/@PACKAGE_TARNAME@
+ 
+ 
+ ##
+@@ -50,6 +51,7 @@ PRELOAD_MODULES=@PRELOAD_MODULES@
+ 
+ # Flags to link with libdl.
+ DL_LIBS=@DL_LIBS@
++INTL_LIBS=@INTL_LIBS@
+ 
+ 
+ ##