merge of 'd0e2c30b999cbef32c26717651606b8411ad02d6'

and 'ffac2606c1f6116f54c1871ff55c69f027252547'
author: Erik Hovland <erik@hovland.org> 2006-08-30 18:42:42 +0000
committer: Erik Hovland <erik@hovland.org> 2006-08-30 18:42:42 +0000
commit: 4d36c0d6c6c4e6ed9f148d70588fdb16798e9b9c (patch)
tree: e1e2d433887f193ea6be861ece68309e7d667619
parent: ff49b42aedb3c09f71cb35456140b9afcf6b40b8 (diff)
parent: 71bd0cd9cf4addbc38028705674fb56c2a644071 (diff)
289 files changed, 9188 insertions, 25242 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 56a13ff309..51b6d2111f 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1,5 +1,4 @@
 BB_DEFAULT_TASK = "build"
-PATCHES_DIR="${S}"
 
 def base_dep_prepend(d):
 	import bb;
@@ -13,9 +12,11 @@ def base_dep_prepend(d):
 	# INHIBIT_DEFAULT_DEPS doesn't apply to the patch command.  Whether or  not
 	# we need that built is the responsibility of the patch function / class, not
 	# the application.
-	patchdeps = bb.data.getVar("PATCH_DEPENDS", d, 1)
-	if patchdeps and not patchdeps in bb.data.getVar("PROVIDES", d, 1):
-		deps = patchdeps
+	patchdeps = bb.data.getVar("PATCHTOOL", d, 1)
+        if patchdeps:
+		patchdeps = "%s-native" % patchdeps
+		if not patchdeps in bb.data.getVar("PROVIDES", d, 1):
+			deps = patchdeps
 
 	if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
 		if (bb.data.getVar('HOST_SYS', d, 1) !=
@@ -40,6 +41,20 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
 	else:
 		return falsevalue
 
+def base_contains(variable, checkvalue, truevalue, falsevalue, d):
+       import bb
+       if bb.data.getVar(variable,d,1).find(checkvalue) != -1:
+               return truevalue
+       else:
+               return falsevalue
+
+def base_both_contain(variable1, variable2, checkvalue, d):
+       import bb
+       if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1:
+               return checkvalue
+       else:
+               return ""
+
 DEPENDS_prepend="${@base_dep_prepend(d)} "
 
 def base_set_filespath(path, d):
@@ -50,7 +65,7 @@ def base_set_filespath(path, d):
 		overrides = overrides + ":"
 		for o in overrides.split(":"):
 			filespath.append(os.path.join(p, o))
-	bb.data.setVar("FILESPATH", ":".join(filespath), d)
+	return ":".join(filespath)
 
 FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
 
@@ -437,86 +452,6 @@ python base_do_unpack() {
 			raise bb.build.FuncFailed()
 }
 
-addtask patch after do_unpack
-do_patch[dirs] = "${WORKDIR}"
-python base_do_patch() {
-	import re
-	import bb.fetch
-
-	src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
-	if not src_uri:
-		return
-
-	patchcleancmd = bb.data.getVar('PATCHCLEANCMD', d, 1)
-	if patchcleancmd:
-		bb.data.setVar("do_patchcleancmd", patchcleancmd, d)
-		bb.data.setVarFlag("do_patchcleancmd", "func", 1, d)
-		bb.build.exec_func("do_patchcleancmd", d)
-
-	workdir = bb.data.getVar('WORKDIR', d, 1)
-	for url in src_uri:
-
-		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
-		if not "patch" in parm:
-			continue
-
-		bb.fetch.init([url],d)
-		url = bb.encodeurl((type, host, path, user, pswd, []))
-		local = os.path.join('/', bb.fetch.localpath(url, d))
-
-		# did it need to be unpacked?
-		dots = os.path.basename(local).split(".")
-		if dots[-1] in ['gz', 'bz2', 'Z']:
-			unpacked = os.path.join(bb.data.getVar('WORKDIR', d),'.'.join(dots[0:-1]))
-		else:
-			unpacked = local
-		unpacked = bb.data.expand(unpacked, d)
-
-		if "pnum" in parm:
-			pnum = parm["pnum"]
-		else:
-			pnum = "1"
-
-		if "pname" in parm:
-			pname = parm["pname"]
-		else:
-			pname = os.path.basename(unpacked)
-
-		if "mindate" in parm:
-			mindate = parm["mindate"]
-		else:
-			mindate = 0
-
-		if "maxdate" in parm:
-			maxdate = parm["maxdate"]
-		else:
-			maxdate = "20711226"
-
-		pn = bb.data.getVar('PN', d, 1)
-		srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
-
-		if not srcdate:
-			srcdate = bb.data.getVar('SRCDATE', d, 1)
-
-		if srcdate == "now": 
-			srcdate = bb.data.getVar('DATE', d, 1)
-
-		if (maxdate < srcdate) or (mindate > srcdate):
-			if (maxdate < srcdate):
-				bb.note("Patch '%s' is outdated" % pname)
-
-			if (mindate > srcdate):
-				bb.note("Patch '%s' is predated" % pname)
-
-			continue
-
-		bb.note("Applying patch '%s'" % pname)
-		bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
-		bb.data.setVarFlag("do_patchcmd", "func", 1, d)
-		bb.data.setVarFlag("do_patchcmd", "dirs", "${WORKDIR} ${S}", d)
-		bb.build.exec_func("do_patchcmd", d)
-}
-
 
 addhandler base_eventhandler
 python base_eventhandler() {
@@ -543,7 +478,8 @@ python base_eventhandler() {
 		msg += messages.get(name[5:]) or name[5:]
 	elif name == "UnsatisfiedDep":
 		msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
-	note(msg)
+	if msg:
+		note(msg)
 
 	if name.startswith("BuildStarted"):
 		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
@@ -613,13 +549,13 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T
 			     ${STAGING_DATADIR} \
 			     ${S} ${B}"
 
-addtask populate_staging after do_compile
+addtask populate_staging after do_package
 
 python do_populate_staging () {
 	bb.build.exec_func('do_stage', d)
 }
 
-addtask install after do_compile
+addtask install after do_compile 
 do_install[dirs] = "${S} ${B}"
 
 base_do_install() {
@@ -746,7 +682,10 @@ python () {
 				return
 }
 
-EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_patch do_populate_pkgs do_stage
+# Patch handling
+inherit patch
+
+EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage
 
 MIRRORS[func] = "0"
 MIRRORS () {
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index b0c5723873..686f8e6596 100644
--- a/classes/gconf.bbclass
+++ b/classes/gconf.bbclass
@@ -1,3 +1,5 @@
+DEPENDS += "gconf"
+
 gconf_postinst() {
 if [ "$1" = configure ]; then
 	if [ "x$D" != "x" ]; then
diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
new file mode 100644
index 0000000000..0f68e6812b
--- /dev/null
+++ b/classes/gtk-icon-cache.bbclass
@@ -0,0 +1,38 @@
+FILES_${PN} += "${datadir}/icons/hicolor"
+
+gtk-icon-cache_postinst() {
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+gtk-update-icon-cache -q /usr/share/icons/hicolor
+}
+
+gtk-icon-cache_postrm() {
+gtk-update-icon-cache -q /usr/share/icons/hicolor
+}
+
+python populate_packages_append () {
+	import os.path
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	
+	for pkg in packages:
+		icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
+		if not os.path.exists(icon_dir):
+			continue
+		
+		bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
+		
+		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+		if not postinst:
+			postinst = '#!/bin/sh\n'
+		postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1)
+		bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
+
+		postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
+		if not postrm:
+			postrm = '#!/bin/sh\n'
+		postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1)
+		bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
+}
+
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 0d6a7734af..9b913ecf82 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -725,7 +725,7 @@ python package_do_split_locales() {
 	bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
 }
 
-PACKAGEFUNCS ?= " do_install package_do_split_locales \
+PACKAGEFUNCS ?= " package_do_split_locales \
 		populate_packages package_do_shlibs \
 		package_do_pkgconfig read_shlibdeps"
 python package_do_package () {
@@ -738,4 +738,4 @@ do_package[dirs] = "${D}"
 do_package[deptask] = "do_package"
 populate_packages[dirs] = "${D}"
 EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook
-addtask package before do_build after do_populate_staging
+addtask package before do_build after do_install
diff --git a/classes/patch.bbclass b/classes/patch.bbclass
new file mode 100644
index 0000000000..5e40b3dc0d
--- /dev/null
+++ b/classes/patch.bbclass
@@ -0,0 +1,483 @@
+# Copyright (C) 2006  OpenedHand LTD
+
+def patch_init(d):
+	import os, sys
+
+	def md5sum(fname):
+		import md5, sys
+
+		f = file(fname, 'rb')
+		m = md5.new()
+		while True:
+			d = f.read(8096)
+			if not d:
+				break
+			m.update(d)
+		f.close()
+		return m.hexdigest()
+
+	class CmdError(Exception):
+		def __init__(self, exitstatus, output):
+			self.status = exitstatus
+			self.output = output
+
+		def __str__(self):
+			return "Command Error: exit status: %d  Output:\n%s" % (self.status, self.output)
+
+	class NotFoundError(Exception):
+		def __init__(self, path):
+			self.path = path
+		def __str__(self):
+			return "Error: %s not found." % self.path
+
+	def runcmd(args, dir = None):
+		import commands
+
+		if dir:
+			olddir = os.path.abspath(os.curdir)
+			if not os.path.exists(dir):
+				raise NotFoundError(dir)
+			os.chdir(dir)
+			# print("cwd: %s -> %s" % (olddir, self.dir))
+
+		try:
+			args = [ commands.mkarg(str(arg)) for arg in args ]
+			cmd = " ".join(args)
+			# print("cmd: %s" % cmd)
+			(exitstatus, output) = commands.getstatusoutput(cmd)
+			if exitstatus != 0:
+				raise CmdError(exitstatus >> 8, output)
+			return output
+
+		finally:
+			if dir:
+				os.chdir(olddir)
+
+	class PatchError(Exception):
+		def __init__(self, msg):
+			self.msg = msg
+
+		def __str__(self):
+			return "Patch Error: %s" % self.msg
+
+	import bb, bb.data, bb.fetch
+
+	class PatchSet(object):
+		defaults = {
+			"strippath": 1
+		}
+
+		def __init__(self, dir, d):
+			self.dir = dir
+			self.d = d
+			self.patches = []
+			self._current = None
+
+		def current(self):
+			return self._current
+
+		def Clean(self):
+			"""
+			Clean out the patch set.  Generally includes unapplying all
+			patches and wiping out all associated metadata.
+			"""
+			raise NotImplementedError()
+
+		def Import(self, patch, force):
+			if not patch.get("file"):
+				if not patch.get("remote"):
+					raise PatchError("Patch file must be specified in patch import.")
+				else:
+					patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
+
+			for param in PatchSet.defaults:
+				if not patch.get(param):
+					patch[param] = PatchSet.defaults[param]
+
+			if patch.get("remote"):
+				patch["file"] = bb.data.expand(bb.fetch.localpath(patch["remote"], self.d), self.d)
+
+			patch["filemd5"] = md5sum(patch["file"])
+
+		def Push(self, force):
+			raise NotImplementedError()
+
+		def Pop(self, force):
+			raise NotImplementedError()
+
+		def Refresh(self, remote = None, all = None):
+			raise NotImplementedError()
+
+
+	class PatchTree(PatchSet):
+		def __init__(self, dir, d):
+			PatchSet.__init__(self, dir, d)
+
+		def Import(self, patch, force = None):
+			""""""
+			PatchSet.Import(self, patch, force)
+
+			self.patches.insert(self._current or 0, patch)
+
+		def _applypatch(self, patch, force = None, reverse = None):
+			shellcmd = ["patch", "<", patch['file'], "-p", patch['strippath']]
+			if reverse:
+				shellcmd.append('-R')
+			shellcmd.append('--dry-run')
+
+			try:
+				output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+			except CmdError:
+				if force:
+					shellcmd.pop(len(shellcmd) - 1)
+					output = runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
+				else:
+					import sys
+					raise sys.exc_value
+
+			return output
+
+		def Push(self, force = None, all = None):
+			if all:
+				for i in self.patches:
+					if self._current is not None:
+						self._current = self._current + 1
+					else:
+						self._current = 0
+					self._applypatch(i, force)
+			else:
+				if self._current is not None:
+					self._current = self._current + 1
+				else:
+					self._current = 0
+				self._applypatch(self.patches[self._current], force)
+
+
+		def Pop(self, force = None, all = None):
+			if all:
+				for i in self.patches:
+					self._applypatch(i, force, True)
+			else:
+				self._applypatch(self.patches[self._current], force, True)
+
+		def Clean(self):
+			""""""
+
+	class QuiltTree(PatchSet):
+		def _runcmd(self, args):
+			runcmd(["quilt"] + args, self.dir)
+
+		def _quiltpatchpath(self, file):
+			return os.path.join(self.dir, "patches", os.path.basename(file))
+
+
+		def __init__(self, dir, d):
+			PatchSet.__init__(self, dir, d)
+			self.initialized = False
+			p = os.path.join(self.dir, 'patches')
+			if not os.path.exists(p):
+				os.makedirs(p)
+
+		def Clean(self):
+			try:
+				self._runcmd(["pop", "-a", "-f"])
+			except Exception:
+				pass
+			self.initialized = True
+
+		def InitFromDir(self):
+			# read series -> self.patches
+			seriespath = os.path.join(self.dir, 'patches', 'series')
+			if not os.path.exists(self.dir):
+				raise Exception("Error: %s does not exist." % self.dir)
+			if os.path.exists(seriespath):
+				series = file(seriespath, 'r')
+				for line in series.readlines():
+					patch = {}
+					parts = line.strip().split()
+					patch["quiltfile"] = self._quiltpatchpath(parts[0])
+					patch["quiltfilemd5"] = md5sum(patch["quiltfile"])
+					if len(parts) > 1:
+						patch["strippath"] = parts[1][2:]
+					self.patches.append(patch)
+				series.close()
+
+				# determine which patches are applied -> self._current
+				try:
+					output = runcmd(["quilt", "applied"], self.dir)
+				except CmdError:
+					if sys.exc_value.output.strip() == "No patches applied":
+						return
+					else:
+						raise sys.exc_value
+				output = [val for val in output.split('\n') if not val.startswith('#')]
+				for patch in self.patches:
+					if os.path.basename(patch["quiltfile"]) == output[-1]:
+						self._current = self.patches.index(patch)
+			self.initialized = True
+
+		def Import(self, patch, force = None):
+			if not self.initialized:
+				self.InitFromDir()
+			PatchSet.Import(self, patch, force)
+
+			args = ["import", "-p", patch["strippath"]]
+			if force:
+				args.append("-f")
+			args.append(patch["file"])
+
+			self._runcmd(args)
+
+			patch["quiltfile"] = self._quiltpatchpath(patch["file"])
+			patch["quiltfilemd5"] = md5sum(patch["quiltfile"])
+
+			# TODO: determine if the file being imported:
+			#	   1) is already imported, and is the same
+			#	   2) is already imported, but differs
+
+			self.patches.insert(self._current or 0, patch)
+
+
+		def Push(self, force = None, all = None):
+			# quilt push [-f]
+
+			args = ["push"]
+			if force:
+				args.append("-f")
+			if all:
+				args.append("-a")
+
+			self._runcmd(args)
+
+			if self._current is not None:
+				self._current = self._current + 1
+			else:
+				self._current = 0
+
+		def Pop(self, force = None, all = None):
+			# quilt pop [-f]
+			args = ["pop"]
+			if force:
+				args.append("-f")
+			if all:
+				args.append("-a")
+
+			self._runcmd(args)
+
+			if self._current == 0:
+				self._current = None
+
+			if self._current is not None:
+				self._current = self._current - 1
+
+		def Refresh(self, **kwargs):
+			if kwargs.get("remote"):
+				patch = self.patches[kwargs["patch"]]
+				if not patch:
+					raise PatchError("No patch found at index %s in patchset." % kwargs["patch"])
+				(type, host, path, user, pswd, parm) = bb.decodeurl(patch["remote"])
+				if type == "file":
+					import shutil
+					if not patch.get("file") and patch.get("remote"):
+						patch["file"] = bb.fetch.localpath(patch["remote"], self.d)
+
+					shutil.copyfile(patch["quiltfile"], patch["file"])
+				else:
+					raise PatchError("Unable to do a remote refresh of %s, unsupported remote url scheme %s." % (os.path.basename(patch["quiltfile"]), type))
+			else:
+				# quilt refresh
+				args = ["refresh"]
+				if kwargs.get("quiltfile"):
+					args.append(os.path.basename(kwargs["quiltfile"]))
+				elif kwargs.get("patch"):
+					args.append(os.path.basename(self.patches[kwargs["patch"]]["quiltfile"]))
+				self._runcmd(args)
+
+	class Resolver(object):
+		def __init__(self, patchset):
+			raise NotImplementedError()
+
+		def Resolve(self):
+			raise NotImplementedError()
+
+		def Revert(self):
+			raise NotImplementedError()
+
+		def Finalize(self):
+			raise NotImplementedError()
+
+	class NOOPResolver(Resolver):
+		def __init__(self, patchset):
+			self.patchset = patchset
+
+		def Resolve(self):
+			olddir = os.path.abspath(os.curdir)
+			os.chdir(self.patchset.dir)
+			try:
+				self.patchset.Push()
+			except Exception:
+				os.chdir(olddir)
+				raise sys.exc_value
+
+	# Patch resolver which relies on the user doing all the work involved in the
+	# resolution, with the exception of refreshing the remote copy of the patch
+	# files (the urls).
+	class UserResolver(Resolver):
+		def __init__(self, patchset):
+			self.patchset = patchset
+
+		# Force a push in the patchset, then drop to a shell for the user to
+		# resolve any rejected hunks
+		def Resolve(self):
+
+			olddir = os.path.abspath(os.curdir)
+			os.chdir(self.patchset.dir)
+			try:
+				self.patchset.Push(True)
+			except CmdError, v:
+				# Patch application failed
+				if sys.exc_value.output.strip() == "No patches applied":
+					return
+				print(sys.exc_value)
+				print('NOTE: dropping user into a shell, so that patch rejects can be fixed manually.')
+
+				os.system('/bin/sh')
+
+				# Construct a new PatchSet after the user's changes, compare the
+				# sets, checking patches for modifications, and doing a remote
+				# refresh on each.
+				oldpatchset = self.patchset
+				self.patchset = oldpatchset.__class__(self.patchset.dir, self.patchset.d)
+
+				for patch in self.patchset.patches:
+					oldpatch = None
+					for opatch in oldpatchset.patches:
+						if opatch["quiltfile"] == patch["quiltfile"]:
+							oldpatch = opatch
+
+					if oldpatch:
+						patch["remote"] = oldpatch["remote"]
+						if patch["quiltfile"] == oldpatch["quiltfile"]:
+							if patch["quiltfilemd5"] != oldpatch["quiltfilemd5"]:
+								bb.note("Patch %s has changed, updating remote url %s" % (os.path.basename(patch["quiltfile"]), patch["remote"]))
+								# user change?  remote refresh
+								self.patchset.Refresh(remote=True, patch=self.patchset.patches.index(patch))
+							else:
+								# User did not fix the problem.  Abort.
+								raise PatchError("Patch application failed, and user did not fix and refresh the patch.")
+			except Exception:
+				os.chdir(olddir)
+				raise
+			os.chdir(olddir)
+
+	g = globals()
+	g["PatchSet"] = PatchSet
+	g["PatchTree"] = PatchTree
+	g["QuiltTree"] = QuiltTree
+	g["Resolver"] = Resolver
+	g["UserResolver"] = UserResolver
+	g["NOOPResolver"] = NOOPResolver
+	g["NotFoundError"] = NotFoundError
+	g["CmdError"] = CmdError
+
+addtask patch after do_unpack
+do_patch[dirs] = "${WORKDIR}"
+python patch_do_patch() {
+	import re
+	import bb.fetch
+
+	patch_init(d)
+
+	src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
+	if not src_uri:
+		return
+
+	patchsetmap = {
+		"patch": PatchTree,
+		"quilt": QuiltTree,
+	}
+
+	cls = patchsetmap[bb.data.getVar('PATCHTOOL', d, 1) or 'quilt']
+
+	resolvermap = {
+		"noop": NOOPResolver,
+		"user": UserResolver,
+	}
+
+	rcls = resolvermap[bb.data.getVar('PATCHRESOLVE', d, 1) or 'user']
+
+	s = bb.data.getVar('S', d, 1)
+
+	path = os.getenv('PATH')
+	os.putenv('PATH', bb.data.getVar('PATH', d, 1))
+	patchset = cls(s, d)
+	patchset.Clean()
+
+	resolver = rcls(patchset)
+
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	for url in src_uri:
+		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
+		if not "patch" in parm:
+			continue
+
+		bb.fetch.init([url],d)
+		url = bb.encodeurl((type, host, path, user, pswd, []))
+		local = os.path.join('/', bb.fetch.localpath(url, d))
+
+		# did it need to be unpacked?
+		dots = os.path.basename(local).split(".")
+		if dots[-1] in ['gz', 'bz2', 'Z']:
+			unpacked = os.path.join(bb.data.getVar('WORKDIR', d),'.'.join(dots[0:-1]))
+		else:
+			unpacked = local
+		unpacked = bb.data.expand(unpacked, d)
+
+		if "pnum" in parm:
+			pnum = parm["pnum"]
+		else:
+			pnum = "1"
+
+		if "pname" in parm:
+			pname = parm["pname"]
+		else:
+			pname = os.path.basename(unpacked)
+
+		if "mindate" in parm:
+			mindate = parm["mindate"]
+		else:
+			mindate = 0
+
+		if "maxdate" in parm:
+			maxdate = parm["maxdate"]
+		else:
+			maxdate = "20711226"
+
+		pn = bb.data.getVar('PN', d, 1)
+		srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+
+		if not srcdate:
+			srcdate = bb.data.getVar('SRCDATE', d, 1)
+
+		if srcdate == "now":
+			srcdate = bb.data.getVar('DATE', d, 1)
+
+		if (maxdate < srcdate) or (mindate > srcdate):
+			if (maxdate < srcdate):
+				bb.note("Patch '%s' is outdated" % pname)
+
+			if (mindate > srcdate):
+				bb.note("Patch '%s' is predated" % pname)
+
+			continue
+
+		bb.note("Applying patch '%s'" % pname)
+		try:
+			patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
+		except NotFoundError:
+			import sys
+			raise bb.build.FuncFailed(str(sys.exc_value))
+		resolver.Resolve()
+}
+
+EXPORT_FUNCTIONS do_patch
diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass
index 340446917e..7f590e1b15 100644
--- a/classes/rm_work.bbclass
+++ b/classes/rm_work.bbclass
@@ -19,4 +19,4 @@ do_rm_work () {
 }
 
 addtask rm_work before do_build
-addtask rm_work after do_package
+addtask rm_work after do_populate_staging
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0a141f883e..2e3cb0f980 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -188,8 +188,6 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
-IMAGE_FSTYPE = "jffs2"
-IMAGE_FSTYPES = "${IMAGE_FSTYPE}"
 IMAGE_ROOTFS_SIZE_ext2 = "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
@@ -241,6 +239,12 @@ export MAKE = "make"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 ##################################################################
+# Patch handling.
+##################################################################
+PATCHTOOL = 'quilt'
+PATCHRESOLVE = 'user'
+
+##################################################################
 # Build flags and options.
 ##################################################################
 
@@ -338,12 +342,6 @@ SRC_URI = "file://${FILE}"
 MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
 MKTEMPCMD = "mktemp -q ${TMPBASE}"
 
-# Program to be used to patch sources, use 'inherit patcher' to overwrite this:
-
-PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
-PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push"
-PATCH_DEPENDS = "quilt-native"
-
 # GNU patch tries to be intellgent about checking out read-only files from
 # a RCS, which freaks out those special folks with active Perforce clients
 # the following makes patch ignore RCS:
@@ -389,7 +387,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # This works for  functions as well, they are really just environment variables.
 #OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
 # Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
-OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
+OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ##################################################################
 # Include the rest of the config files.
@@ -409,7 +407,9 @@ require conf/sanity.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
+IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
+MACHINE_TASK_PROVIDER ?= "task-bootstrap"
 
 
 ##################################################################
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2007.1.conf
index ca7ddc873d..327d4123cc 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -32,6 +32,8 @@ FEED_URIS += " \
 SRCDATE_gconf-dbus = "20060719"
 SRCDATE_gnome-vfs-dbus = "20060803"
 
+PREFERRED_VERSION_qemu-native = "0.8.2"
+
 CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
 http://www.oesources.org/source/current/"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 9c2679aff1..96bc33ede3 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -16,8 +16,8 @@ MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>"
 INHERIT += "package_ipk debian multimachine"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
-PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
-ENABLE_BINARY_LOCALE_GENERATION ?= ""
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
 
 #Use the ARM EABI when building for an ARM cpu. We can't use overrides
@@ -32,12 +32,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 BUILD_OPTIMIZATION = "-Os"
+CXXFLAGS += "-fvisibility-inlines-hidden"
 
 #ARM EABI is softfloat by default, but let's make sure :)
-TARGET_FPU_arm = "soft"
-
-#Always ship these packages
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
+#make it overridable for platforms with FPU, like ep93xx or i.mx31
+TARGET_FPU_arm ?= "soft"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
@@ -45,3 +44,6 @@ DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc
index 2646fe78a6..ea360f5dc5 100644
--- a/conf/distro/include/familiar.inc
+++ b/conf/distro/include/familiar.inc
@@ -15,3 +15,6 @@ PARALLEL_INSTALL_MODULES = "1"
 UDEV_DEVFS_RULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/maemo-preferred.inc b/conf/distro/include/maemo-preferred.inc
index 943f244326..3b31837911 100644
--- a/conf/distro/include/maemo-preferred.inc
+++ b/conf/distro/include/maemo-preferred.inc
@@ -5,6 +5,6 @@ PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
 PREFERRED_PROVIDER_esd = "osso-esd"
 PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
 PREFERRED_VERSION_glib-2.0 = "2.6.4"
-PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_pango = "1.8.2"
 PREFERRED_VERSION_atk = "1.9.0"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
-\ No newline at end of file
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
index 264cceecfd..ea408ff221 100644
--- a/conf/distro/include/openzaurus.inc
+++ b/conf/distro/include/openzaurus.inc
@@ -20,3 +20,6 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 # Set minimal version of BitBake needed
 BB_MIN_VERSION = "1.4.4"
 INHERIT += "sanity"
+
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
index 3bbc6be01a..256bc0103f 100644
--- a/conf/distro/include/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
@@ -19,6 +19,7 @@ PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
 PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.3"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.97"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 36702025c1..56d9c5b059 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -20,9 +20,9 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.109"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 180ca47b17..e78888a02c 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -17,6 +17,7 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 #PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 #PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 #PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_pango ?= "1.8.2"
 #PREFERRED_VERSION_gtk+ ?= "2.6.3"
 #PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 #PREFERRED_VERSION_libgpewidget ?= "0.97"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index b9cc82e1d3..0696ad1909 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -72,7 +72,7 @@ SRCDATE_oprofile ?= "20060214"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
-SRCDATE_qemu-native ?= "20060526"
+SRCDATE_qemu-native ?= "20060723"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf
index 0e3d36ed2d..8118acb1da 100644
--- a/conf/distro/openmn.conf
+++ b/conf/distro/openmn.conf
@@ -16,6 +16,6 @@ IPKG_EXTRA_ARCHS = "armv5te openmn"
 
 FEED_URIS  = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
 
-IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/rootfs.${MACHINE} ${EXTRA_IMAGECMD}"
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index 192400b9a1..fb06ca7f47 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -9,3 +9,26 @@ TARGET_FPU ?= "soft"
 # 2.4 vs 2.6 is a distro decision.
 MODUTILS = "26"
 BOOTSTRAP_EXTRA_RDEPENDS += "udev"
+
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+#EABI stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+
+
+#use EABI toolchain
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_binutils ?= "2.17"
+PREFERRED_VERSION_binutils-cross ?= "2.17"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+PREFERRED_VERSION_glibc ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.4"
+
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 0c757edc45..da1efa9cc4 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -34,7 +34,7 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg
 
 INHERIT += " package_ipk nslu2-jffs2-image"
 
-IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "jffs2"
 UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
 EXTRA_IMAGECMD_jffs2 = "--no-eraseblock-headers --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"
 
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 005a70e664..0358864c70 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -4,6 +4,8 @@
 
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
-IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
+
+IPKG_EXTRA_ARCHS += "iwmmxt" 
+IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 0bd9623526..4b1d8edb80 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -5,5 +5,7 @@
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
+IMAGE_FSTYPES ?= "jffs2"
+
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
new file mode 100644
index 0000000000..68b754f2d3
--- /dev/null
+++ b/conf/machine/dht-walnut.conf
@@ -0,0 +1,20 @@
+TARGET_ARCH = "powerpc"
+IPKG_ARCHS = "all powerpc ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-dht-walnut"
+
+#TARGET_FPU = "soft"
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.9"
+
+# TARGET_VENDOR = "-oe"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev"
+
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.5"
+# GLIBC_ADDONS = "nptl"
+# GLIBC_EXTRA_OECONF = "--with-tls"
+
+
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index dd6b0f0b93..e82da27574 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -1,7 +1,7 @@
 TARGET_ARCH = "i586"
 TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPE = "ext2.gz"
+IMAGE_FSTYPES = "ext2.gz"
 BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 410de9a100..41301c1721 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -11,6 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
 ROOT_FLASH_SIZE = "32"
+MODUTILS = "26"
 PCMCIA_MANAGER = "pcmciautils"
 
 BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 32e9304cdb..008bfb252f 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -2,8 +2,8 @@
 #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
+#KERNEL ?= "kernel24"
+KERNEL ?= "kernel26"
 
 OVERRIDES =. "${KERNEL}:"
 
@@ -12,12 +12,14 @@ INHERIT += "linux_modules"
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
 ROOT_FLASH_SIZE = "32"
 
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
+
 BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 1b128ea6cb..eff0ad4c7c 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1,39 +1 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
-
-# Ethernet modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
-
-# Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
-                             kernel-module-hermes kernel-module-orinoco \
-                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
-                             hostap-conf orinoco-conf"
-
-# Sound Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle "
+require conf/machine/include/zaurus-clamshell-2.6.conf
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
new file mode 100644
index 0000000000..83ddf24b87
--- /dev/null
+++ b/conf/machine/include/qemu.conf
@@ -0,0 +1,10 @@
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
+
+IMAGE_FSTYPES ?= "tar.bz2 ext2"
+
+ROOT_FLASH_SIZE = "100"
diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
index c7805c36fe..6831b0ea91 100644
--- a/conf/machine/include/tosa-2.6.conf
+++ b/conf/machine/include/tosa-2.6.conf
@@ -1,6 +1,6 @@
 include conf/machine/include/zaurus-clamshell-2.6.conf
 # wlan-ng Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
+MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
 # WM97xx Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
+#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
index 5e2f6b7c62..31fe8868ca 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.conf
@@ -1,3 +1,5 @@
-#if gcc breaks change arm926ejs to arm926ej-s
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+# For gcc 3.x you need:
+#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+# For gcc 4.x you need:
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
 PACKAGE_ARCH = "armv5te"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index 2433c5a748..e0a9e38e91 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -6,42 +6,15 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin  wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
+MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost"
+MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2"
 
-# Ethernet modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
 
-# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
+MACHINE_EXTRA_RDEPENDS = "zaurusd"
+MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
+MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
-# Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
-                             kernel-module-hermes kernel-module-orinoco \
-                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
-                             hostap-conf orinoco-conf"
-
-# Sound Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-			     
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi "
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz "
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz "
-BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle "
+MACHINE_TASK_PROVIDER = "task-base"
+\ No newline at end of file
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index f85c2a1221..e600a4926d 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -14,16 +14,13 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 # add a summary to the jffs2 file to make it mount a lot faster
 EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
                          -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                          --eraseblock=0x4000 -l -p"
+                         --eraseblock=0x4000 -l -p"
 IMAGE_CMD_jffs2 +=	"; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-  		         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
-
+		         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
-include conf/machine/include/handheld-common.conf
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index fa3675fb59..84380a49d0 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -18,7 +18,12 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 			  -e 256KiB -p"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 MODUTILS = "26"	
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget"
+
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
@@ -37,10 +42,10 @@ include conf/machine/include/handheld-common.conf
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-#include conf/machine/include/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-include conf/machine/include/tune-iwmmxt.conf
+#include conf/machine/include/tune-iwmmxt.conf
 
 
 # These modules are now compiled into the kernel:
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 9d483d4c55..2b9b572024 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -7,13 +7,13 @@ PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils"
 #BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules"
-#IMAGE_FSTYPE = "cramfs"
+#IMAGE_FSTYPES = "cramfs"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "ttyS0 115200 vt100"
 
 TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
-IMAGE_FSTYPE = "ext2"
+IMAGE_FSTYPES = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
 
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index edd7213346..7069639330 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -16,20 +16,21 @@ GUI_MACHINE_CLASS = "bigscreen"
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-arm926ejs.conf
 
-
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
 EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # serial console port on devboard rev. B3
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
- apm  ppp wireless-tools console-tools"
-
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
+MACHINE_TASK_PROVIDER = "task-base"
+\ No newline at end of file
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index dccc5a227b..cf9e96ce19 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -9,14 +9,20 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
+PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020"
+
+# Use current git until I can find a git tag that builds for omap5912osk
+PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
+#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
+
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 # PCMCIA Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
 # IDE modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
@@ -25,9 +31,9 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
 # Video er LCD Driver
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
 # DSP Interface
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
 
 include conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 3341efd1a7..c32353f01e 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -5,42 +5,11 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/qemu.conf
+require conf/machine/include/tune-arm926ejs.conf
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
-
-# Ethernet modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-#                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-#                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \
-#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-IMAGE_FSTYPES = "tar.bz2"
-
-ROOT_FLASH_SIZE = "100"
-# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
-# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
+MACHINE_TASK_PROVIDER = "task-base"
+\ No newline at end of file
diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf
new file mode 100644
index 0000000000..aec2a8f726
--- /dev/null
+++ b/conf/machine/rb500.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Mikrotik RB500
+#@DESCRIPTION: Machine configuration for the MIPS based Routerboard
+
+TARGET_ARCH = "mipsel"
+TARGET_CC_ARCH = "-Os -mips2"
+IPKG_ARCHS = "all mipsel ${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 3d80a41486..af50217e0f 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,15 +5,10 @@
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
-IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
-
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-PIVOTBOOT_EXTRA_RRECOMMENDS += ""
-
-# Useful things for the built-in Harddisk
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
-IMAGE_FSTYPES = "jffs2 tar.gz"
+IPKG_EXTRA_ARCHS += "iwmmxt"
+IMAGE_FSTYPES ?= "tar.gz"
 
 ROOT_FLASH_SIZE = "100"
 # actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
index 5376be0dda..36974d1336 100644
--- a/conf/machine/sun4cdm.conf
+++ b/conf/machine/sun4cdm.conf
@@ -1,6 +1,6 @@
 TARGET_ARCH = "sparc"
 
-IMAGE_FSTYPE = "cramfs"
+IMAGE_FSTYPES = "cramfs"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev"
 
diff --git a/packages/links/links-2.1pre12/.mtn2git_empty b/contrib/feed-browser/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/links/links-2.1pre12/.mtn2git_empty
+++ b/contrib/feed-browser/.mtn2git_empty
diff --git a/packages/links/links-2.1pre14/.mtn2git_empty b/contrib/feed-browser/css/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/links/links-2.1pre14/.mtn2git_empty
+++ b/contrib/feed-browser/css/.mtn2git_empty
diff --git a/contrib/feed-browser/css/feed.css b/contrib/feed-browser/css/feed.css
new file mode 100644
index 0000000000..f2927f71f8
--- /dev/null
+++ b/contrib/feed-browser/css/feed.css
@@ -0,0 +1,99 @@
+body
+{
+	color: #000;
+	background-color: #fff;
+	font-family: Sans;
+	padding: 10px;
+	margin: 0;
+}
+
+#left
+{
+	position: absolute;
+	left:10px;
+	top:10px;
+	width:200px;
+	background:#fff;
+}
+
+#right
+{
+	background:#fff;
+	margin-left: 199px;
+	margin-right: 0;
+	voice-family: "\"}\"";
+	voice-family: inherit;
+	margin-left: 201px;
+	margin-right:0;
+}
+html>body #right {
+	margin-left: 201px;
+	margin-right:0;
+}
+
+a
+{
+	text-decoration: none;
+	color: #0066cc
+}
+
+table
+{
+	width: 100%;
+}
+
+th
+{
+	font-weight: bold;
+}
+
+td
+{
+	padding: 0 0.5em;
+	vertical-align: top;
+}
+
+#letters
+{
+	margin: 1em 0;
+	text-align: center;
+}
+
+h1
+{
+	padding-top: 1em;
+	font-size: 125%;
+}
+
+h2
+{
+	font-size: 105%;
+}
+
+dt
+{
+	padding-top: 0.5em;
+}
+
+#sections
+{
+	padding-top: 1em;
+	list-style: none;
+	font-size: 0.8em;
+}
+
+.subsections
+{
+	list-style: none;
+	margin-left: -1em;
+}
+.download:before
+{
+	content:  url("http://ewi546.ewi.utwente.nl/tmp/hrw/fb/img/package-x-generic.png"); 
+	padding: 0 2px;
+}
+
+#download
+{
+	list-style: none;
+}
diff --git a/packages/pango/pango-1.13.2/.mtn2git_empty b/contrib/feed-browser/includes/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/pango/pango-1.13.2/.mtn2git_empty
+++ b/contrib/feed-browser/includes/.mtn2git_empty
diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
new file mode 100644
index 0000000000..e1999b066f
--- /dev/null
+++ b/contrib/feed-browser/includes/config.inc
@@ -0,0 +1,142 @@
+<?php
+
+define('DB_FILENAME', './feeds.db');
+
+$feeds = array(
+	array(
+		'distro_name'=>'OpenZaurus', 
+		'distro_version'=>'3.5.4',
+		'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/',
+		'feeds'=>array(
+			array(
+				'name'=>'base',
+				'url'=>'base',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'opie',
+				'url'=>'opie',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'x11',
+				'url'=>'x11',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'upgrades',
+				'url'=>'upgrades',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'perl',
+				'url'=>'perl',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'python',
+				'url'=>'python',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'Collie upgrades',
+				'url'=>'upgrades/machine/collie',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'Tosa upgrades',
+				'url'=>'upgrades/machine/tosa',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'Poodle upgrades',
+				'url'=>'upgrades/machine/poodle',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'Poodle',
+				'url'=>'machine/poodle',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'Collie',
+				'url'=>'machine/collie',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'Tosa',
+				'url'=>'machine/tosa',
+				'type'=>'normal',
+			)
+		)
+	),
+	array(
+		'distro_name'=>'OpenZaurus', 
+		'distro_version'=>'3.5.4.1',
+		'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/',
+		'feeds'=>array(
+			array(
+				'name'=>'base',
+				'url'=>'base',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'opie',
+				'url'=>'opie',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'perl',
+				'url'=>'perl',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'python',
+				'url'=>'python',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'upgrades',
+				'url'=>'upgrades',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'x11',
+				'url'=>'x11',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'C7x0',
+				'url'=>'machine/c7x0',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'Spitz',
+				'url'=>'machine/spitz',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'Akita',
+				'url'=>'machine/akita',
+				'type'=>'normal',
+			),
+			array(
+				'name'=>'Akita upgrades',
+				'url'=>'upgrades/machine/akita',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'C7x0 upgrades',
+				'url'=>'upgrades/machine/c7x0',
+				'type'=>'upgrades',
+			),
+			array(
+				'name'=>'Spitz upgrades',
+				'url'=>'upgrades/machine/spitz',
+				'type'=>'upgrades',
+			)
+		)
+	)
+);
+
+?>
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
new file mode 100644
index 0000000000..2532dd7c08
--- /dev/null
+++ b/contrib/feed-browser/includes/functions.inc
@@ -0,0 +1,457 @@
+<?php
+/*
+ * (c) Koen Kooi 2006
+ * (c) Marcin Juszkiewicz 2006
+ *
+ * This program is free software; you can redistribute it and/or  modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License.
+ * 
+ * This program is distributed in the hope that it will be useful,  but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public License along
+ * with this library; see the file COPYING.LIB.  If not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ *
+ */
+
+error_reporting(E_ALL);
+
+function db_query($query)
+{
+    $result = FALSE;
+
+    if($db_h = sqlite_open(DB_FILENAME))
+    {
+	$query_h = sqlite_query ($db_h, $query);
+	$result = sqlite_fetch_all ($query_h, SQLITE_ASSOC);
+	sqlite_close($db_h);
+    }
+
+    return $result;
+}
+
+function db_query_n($query)
+{
+    $result = FALSE;
+
+    if($db_h = sqlite_open(DB_FILENAME))
+    {
+	$query_h = sqlite_query ($db_h, $query);
+	sqlite_close($db_h);
+    }
+
+    return $result;
+}
+
+function db_table_exists ($db, $mytable)
+{
+	if($query = sqlite_query ($db, "SELECT name FROM sqlite_master WHERE type='table'"))
+	{
+		$tables = sqlite_fetch_all ($query, SQLITE_ASSOC);
+
+		if (!$tables)
+		{       
+			return FALSE;
+		}
+		else
+		{ 
+			foreach ($tables as $table)
+			{ 
+				if ($table['name'] == $mytable)
+				{
+					return TRUE;  
+				}
+			}
+		}
+	}
+
+	// function which is expected to return something need to return something always
+	return FALSE;
+}
+
+function insert_feeds ($db) 
+{
+	global $feeds;
+
+	if(isset($feeds))
+	{
+		$id = 1;
+
+		foreach($feeds as $distro)
+		{
+			foreach($distro['feeds'] as $feed)
+			{
+				sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri, f_type) VALUES
+					(
+						{$id},
+						'{$distro['distro_name']} {$distro['distro_version']} {$feed['name']}',
+						'{$distro['feed_base_url']}{$feed['url']}',
+						'{$feed['type']}'
+					)");
+
+				$id++;
+			}
+		}
+	}
+}
+
+function searchletter($searchletter = '')
+{
+	$ipkgoutput = "<div id='letters'>";
+	$alfabet = array('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y');
+
+	foreach($alfabet as $letter)
+	{
+		if($letter == $searchletter)
+		{
+			$ipkgoutput .= sprintf(" %s |", $letter );
+		}
+		else
+		{
+			$ipkgoutput .= sprintf(" <a href='?action=letter&amp;g=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
+		}
+	}
+
+	$ipkgoutput .= " <a href='?action=letter&amp;g=z' title='packages which names begins with \"z\"'>z</a></div>";
+
+	return $ipkgoutput;
+}
+
+function searchpkg ($searchword)
+{
+	if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section  FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC"))
+	{
+	    return generate_list_of_packages($result);
+	}
+}
+
+function generate_list_of_packages($query_result)
+{
+	$ipkgoutput = "<table>\n";
+	$ipkgoutput .="<tr><th>Package</th><th>Section</th><th>Description</th></tr>\n";
+
+	foreach($query_result as $package)
+	{
+		if (!strstr ($package['p_name'], 'locale'))
+		{
+			if(strlen($package['p_desc']) > 40)
+			{
+				$pos = strpos($package['p_desc'],' ',  40);
+
+				if($pos)
+				{
+					$package['p_desc'] = substr($package['p_desc'], 0, $pos) . '...';
+				}
+			}
+
+			$ipkgoutput .= sprintf
+				("<tr><td><a href='?action=details&amp;pnm=%s'>%s</a></td><td><a href=\"?action=section&amp;section=%s\">%s</a></td><td> %s</td></tr>\n",
+				urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc']));
+		}
+
+	}
+	
+	$ipkgoutput .= '</table>';
+
+	return $ipkgoutput;
+}
+
+function searchsection($section)
+{
+	if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_section LIKE '$section%' ORDER BY p_section ASC, p_name ASC"))
+	{	
+	    return generate_list_of_packages($result);
+	}
+}
+
+function pkgdetails ($package)
+{
+	$result = db_query("SELECT * FROM packages,feeds
+				WHERE (packages.p_name='$package' OR packages.p_provides='$package')
+				    AND feeds.f_id = packages.p_feed 
+				ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
+	
+	// display first result
+
+	if ($result)
+	{
+		$package = $result[0];
+
+		$details = sprintf("<h1>Package details for %s %s</h1>", $package['packages.p_name'], $package['packages.p_version']);
+		$details .= sprintf ("<p id='description'>%s</p>", htmlentities($package['packages.p_desc']));
+		$details .= "<dl>";
+
+		$details .= sprintf ("\n<dt>Maintainer:</dt><dd>%s</dd>", str_replace(array('@',', '), array(' at ', '<br />'), htmlentities($package['packages.p_maintainer'])));
+		
+		if($package['packages.p_homepage']) 
+		{
+			$details .= sprintf ("\n<dt>Homepage:</dt><dd>%s</dd>", $package['packages.p_homepage']);
+		}
+
+		if($package['packages.p_section'])
+		{
+			$details .= sprintf ("\n<dt>Section:</dt><dd><a href='?action=section&amp;section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
+		}
+		
+		if($package['packages.p_depends'])
+		{
+			$details .= sprintf ("\n<dt>Depends:</dt><dd>%s</dd>", addlinks ($package['packages.p_depends']));
+		}
+		
+		if($package['packages.p_recommends'])
+		{
+			$details .= sprintf ("\n<dt>Recommends:</dt><dd>%s</dd>", addlinks ($package['packages.p_recommends']));
+		}
+		
+		if($package['packages.p_replaces'])
+		{
+			$details .= sprintf ("\n<dt>Replaces:</dt><dd>%s</dd>", addlinks ($package['packages.p_replaces']));
+		}
+		
+		if($package['packages.p_provides'])
+		{
+			$details .= sprintf ("\n<dt>Provides:</dt><dd>%s</dd>", addlinks ($package['packages.p_provides']));
+		}
+		
+		if($package['packages.p_conflicts'])
+		{
+			$details .= sprintf ("\n<dt>Conflicts:</dt><dd>%s</dd>", addlinks ($package['packages.p_conflicts']));
+		}
+		
+		$size = $package['packages.p_size'];
+
+		if(strlen($size) > 6) 
+		{
+			$size = sprintf("%02.2f Megabytes", $size / (1024 * 1024));
+		}
+
+		if(strlen($size) > 3 && strlen($size) < 7) 
+		{
+			$size = sprintf("%02.2f Kilobytes", $size / (1024 ));
+		}
+
+		if(strlen($size) < 4) 
+		{
+			$size = sprintf("%s Bytes", $size);
+		}
+
+		$details .= sprintf ("\n<dt>Size:</dt><dd>%s</dd></dl>", $size);
+
+		if($package['packages.p_source'])
+		{
+			$sourcearray = explode (" ", $package['packages.p_source']);
+
+			$details .= "\n<h2>Source:</h2><ul>";
+
+			foreach ($sourcearray as $key => $source_url)
+			{
+				if (substr ($source_url, 0, 4) == "http" || substr ($source_url, 0, 3) == "ftp")
+				{
+					$url_parts = parse_url($source_url);
+
+					$details .= sprintf ("<li><a href='%s'>%s</a></li>", $source_url, array_pop(explode('/', $url_parts['path'])));
+				}
+				else
+				{
+					$details .= sprintf ("<li>%s</li>", $source_url);
+				}
+			}
+
+			$details .= '</ul>';
+
+		}
+
+		$details .= "\n<h2>Available versions and architectures:</h2><ul id='download'>\n";
+
+		foreach($result as $packages_a)
+		{
+			$details .= sprintf("\n<li><a class='download' href='%s' title='%s %s for %s'>%s %s</a> for %s (%s feed)</li>\n",
+				$packages_a['feeds.f_uri']."/".$packages_a['packages.p_file'],
+				$packages_a['packages.p_name'],
+				$packages_a['packages.p_version'],
+				$packages_a['packages.p_arch'],
+				$packages_a['packages.p_name'],
+				$packages_a['packages.p_version'],
+				$packages_a['packages.p_arch'],
+				$packages_a['feeds.f_name']
+			);
+		}
+
+		$details .= "</ul>\n";
+	}
+	else
+	{
+		$details = "<h1>Sorry, package not found\n</h1><a href='./'>return</a>\n";
+	}
+
+	return $details;
+}
+
+function addlinks ($input)
+{
+	// split input elements up
+	$elements = explode (', ', $input);
+
+	$offset = 0;
+
+	foreach ($elements as $element)
+	{
+		// strip version number
+		$element = ereg_replace('^(.*)( \((.*)\))+$', '\\1', $element);
+
+		// do we have this package in the db?
+		$result =  db_query ("SELECT DISTINCT p_name FROM packages WHERE p_name='{$element}' OR p_provides='{$element}'");    
+
+		if(isset($result[0]['p_name']))
+		{
+			// find position of string in line
+			$pos = strpos ($input, $element, $offset);
+			$link = sprintf("<a href=\"?action=details&amp;pnm=%s\">$element</a>", urlencode ($element));
+
+			// replace element with a link
+			$input = substr_replace ($input, $link, $pos, strlen ($element));
+
+			// update offset
+			$offset = ($pos + strlen ($link));
+		}
+		else
+		{
+			$offset += strlen ($element);
+		}
+	}
+
+	return $input;
+} 
+
+function sectionslist()
+{
+	$ipkgoutput = '';
+
+	if($result =  db_query ("SELECT DISTINCT p_section FROM packages ORDER BY p_section"))
+	{
+		$section_up = '';
+
+		$sections = array();
+
+		foreach($result as $package)
+		{
+			$section_split = explode('/', $package['p_section']);
+
+			if($section_up != $section_split[0])
+			{
+				$section_up = $section_split[0];
+			}
+
+			if(isset($section_split[1]))	// x11/gnome/libs
+			{
+				$sections[$section_up][$section_split[1]] = $section_split[1];
+
+				if(isset($section_split[2]))	// x11/gnome/libs
+				{
+					$sections[ $section_up ][ $section_split[1] ] = array($section_split[2]=>$section_split[2]);
+				}
+			}
+		}
+
+		$output = "<ul id='sections'>\n";
+
+		foreach($sections as $section_name1=>$item)
+		{
+			$output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a>",
+				urlencode($section_name1),
+				urlencode($section_name1),
+				$section_name1);
+
+			if(is_array($item))
+			{
+				$output .= '<ul class="subsections">';
+
+				foreach($item as $section_name2=>$subitem)
+				{
+					$section_name = "{$section_name1}/{$section_name2}";
+					$output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a>",
+						urlencode($section_name),
+						urlencode($section_name),
+						$section_name2);
+
+					if(is_array($subitem))
+					{
+						$output .= '<ul class="subsections">';
+
+						foreach($subitem as $section_name3=>$subitem2)
+						{
+							$section_name = "{$section_name1}/{$section_name2}/{$section_name3}";
+							$output .= sprintf ("<li><a href='?action=section&amp;section=%s' title='%s'>%s</a></li>",
+								urlencode($section_name),
+								urlencode($section_name),
+								$section_name3);
+						}
+
+						$output .= '</ul>';
+					}
+
+					$output .= '</li>';
+				}
+
+				$output .= '</ul>';
+			}
+
+			$output .= '</li>';
+		}
+
+		$output .= "</ul>\n";
+	}
+
+	return $output;
+}
+
+function check_database()
+{
+	if($db = sqlite_open(DB_FILENAME))
+	{
+		//initialize db
+		if (db_table_exists ($db, 'packages') === FALSE)
+		{  
+			sqlite_query ($db, "CREATE TABLE  packages (
+				p_name         varchar(50),
+				p_version    varchar(10),
+				p_arch        varchar(12),
+				p_depends    varchar(50),
+				p_maintainer    varchar(50),
+				p_homepage    varchar(100),
+				p_section    varchar(20),
+				p_replaces    varchar(50),
+				p_provides    varchar(50),
+				p_recommends varchar(50),
+				p_conflicts    varchar(50),
+				p_size        int(10),
+				p_md5        char(32),
+				p_source    varchar(500),
+				p_feed        varchar(20),
+				p_file        varchar(100),
+				p_desc        varchar(1000))");
+		}
+
+		if (db_table_exists ($db, 'feeds') === FALSE)
+		{  
+			sqlite_query ($db, "CREATE TABLE feeds (
+				f_id         int(8),
+				f_name       varchar(32),
+				f_uri        varchar(100),
+				f_type		 varchar(16)
+		)");
+
+			insert_feeds ($db) ;
+		}
+
+		sqlite_close($db);
+	}
+}
+
+
+
+?>
diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php
new file mode 100644
index 0000000000..df7282db7d
--- /dev/null
+++ b/contrib/feed-browser/index.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * (c) Koen Kooi 2006
+ * (c) Marcin Juszkiewicz 2006
+ *
+ * This php script is intended to do the following:
+ *
+ * - have searchable webfronted for the feed like packages.ubuntu.com
+ *
+ * ToDo:
+ *
+ * - search functionality
+ * - provide feed-management functionality
+ * - allow uploading of new software
+ *
+ *
+ * This program is free software; you can redistribute it and/or  modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License.
+ * 
+ * This program is distributed in the hope that it will be useful,  but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public License along
+ * with this library; see the file COPYING.LIB.  If not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ *
+ */
+
+require_once 'includes/config.inc';
+require_once 'includes/functions.inc';
+
+check_database();
+
+$action = '';
+
+if(isset($_GET['action']))
+{
+	$action = $_GET['action'];
+}
+
+switch($action)
+{
+	case "details":
+		$ipkgoutput = pkgdetails ($_GET['pnm']);
+		break;
+
+	case "package":
+		$edit = $_POST['edit'];
+		$searchword = $edit['searchword'];
+		$ipkgoutput = searchpkg ("%$searchword%");
+		break;
+
+	case "section":
+		$ipkgoutput = searchsection($_GET['section']);
+		break;
+
+	case "letter":
+		$letter = $_GET['g'];
+		$ipkgoutput = searchpkg ("{$letter}%");
+		break;
+
+	default:
+		$ipkgoutput = searchpkg("a");
+		break;
+}
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    <head>
+	<title>Feed browser</title>
+	<meta http-equiv="Content-Style-Type" content="text/css" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style type="text/css" media="all">@import "css/feed.css";</style>
+    </head>
+    <body >
+	    <div id="right"><?php echo searchletter(); echo $ipkgoutput; ?></div>
+		<div id="left">
+			<h1>Sections list</h1>
+			<?php echo sectionslist(); ?>
+		</div>
+    </body>
+</html>
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
new file mode 100644
index 0000000000..ed67d3b78a
--- /dev/null
+++ b/contrib/feed-browser/update.php
@@ -0,0 +1,180 @@
+<?php
+/* (c) Koen Kooi 2006
+ *
+ * This program is free software; you can redistribute it and/or  modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,  but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public License along
+ * with this library; see the file COPYING.LIB.  If not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.         
+ *              
+ */         
+
+require_once 'includes/config.inc';
+require_once 'includes/functions.inc';
+
+/*
+   A package entry looks like this:
+   Package: zeroconf
+   Version: 0.9-r0
+   Depends: libc6 (>= 2.4)
+   Provides: libfontconfig-utils
+   Replaces: libfontconfig-utils
+   Conflicts: libfontconfig-utils
+   Section: net
+   Architecture: armv5te
+   Maintainer: Angstrom Developers <angstrom-dev@handhelds.org>
+   MD5Sum: b8bd197224e24759d2162091a0fa727f
+   Size: 12346
+   Filename: zeroconf_0.9-r0_armv5te.ipk
+   Source: http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.9.tar.gz file://zeroconf-default file://debian-zeroconf
+   Description: IPv4 link-local address allocator
+ */
+
+check_database();
+
+$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
+
+if($argc > 1 AND $argv[1] == 'upgrades')
+{
+	$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'");
+}
+
+$start = time();
+$p_count = 0;
+
+foreach($feeds as $feed)
+{
+    print("Updating {$feed['f_name']}: ");
+    db_query_n("DELETE FROM packages WHERE p_feed = '{$feed['f_id']}'");
+
+    $count = 0;
+
+    $packagesgz_h = fopen("compress.zlib://{$feed['f_uri']}/Packages.gz", "r");
+
+    if ($packagesgz_h)
+    {
+	$package_info = array(
+	    'name'=>'', 'version'=>'', 'arch'=>'', 'depends'=>'', 
+	    'maintainer'=>'',  'homepage'=>'',  'section'=>'',  'replaces'=>'', 
+	    'provides'=>'', 'recommends'=>'', 'conflicts'=>'', 'size'=>'',  
+	    'md5sum'=>'', 'source'=>'', 'feed'=>$feed['f_id'], 'file'=>'', 'desc'=>''
+	);
+
+	while (!feof($packagesgz_h)) 
+	{
+	    $buffer = fscanf($packagesgz_h, "%[^:]: %[ -~]");
+	    list ($field, $value) = $buffer;
+
+	    if($field == 'Package' && $count > 0)
+	    {
+		insert_ipkgs($package_info);
+
+		$package_info = array(
+		    'name'=>'', 'version'=>'', 'arch'=>'', 'depends'=>'', 
+		    'maintainer'=>'',  'homepage'=>'',  'section'=>'',  'replaces'=>'', 
+		    'provides'=>'', 'recommends'=>'', 'conflicts'=>'', 'size'=>'',  
+		    'md5sum'=>'', 'source'=>'', 'feed'=>$feed['f_id'], 'file'=>'', 'desc'=>''
+		);
+	    }
+
+	    switch($field)
+	    {
+		case 'Package':
+		    $package_info['name'] = $value; 	
+		    $count++;	
+		    break;
+		case 'Version':
+		    $package_info['version'] = $value;
+		    break;
+		case 'Depends':
+		    $package_info['depends'] = $value;
+		    break;
+		case 'Provides':
+		    $package_info['provides'] = $value;
+		    break;
+		case 'Recommends':
+		    $package_info['recommends'] = $value;
+		    break;
+		case 'Replaces':
+		    $package_info['replaces'] = $value;
+		    break;
+		case 'Conflicts':
+		    $package_info['conflicts'] = $value;
+		    break;
+		case 'Section':
+		    $package_info['section'] = strtolower($value);
+		    break;
+		case 'Architecture':
+		    $package_info['arch'] = $value;
+		    break;
+		case 'Maintainer':
+		    $package_info['maintainer'] = str_replace("'","\"", $value);
+		    break;
+		case 'MD5sum':
+		    $package_info['md5sum'] = $value;
+		    break;
+		case 'Size':
+		    $package_info['size'] = $value;
+		    break;
+		case 'Filename':
+		    $package_info['file'] = $value;
+		    break;
+		case 'Source':
+		    $package_info['source'] = $value;
+		    break;
+		case 'Description':
+		    $package_info['desc'] = str_replace("'","\"", $value);
+		    break;
+	    }
+
+	}
+
+	insert_ipkgs($package_info);
+    }
+
+    $p_count = $count + $p_count;
+    print("$count packages\n");
+    gzclose($packagesgz_h);
+}
+//close the db
+
+$end = time();
+$difference = $end - $start;
+
+$days = floor($difference/86400);
+$difference = $difference - ($days*86400);
+
+$hours = floor($difference/3600);
+$difference = $difference - ($hours*3600);
+
+$minutes = floor($difference/60);
+$difference = $difference - ($minutes*60);
+
+$seconds = $difference;
+
+print "Added $p_count packages in $days days, $hours hours, $minutes minutes and $seconds seconds \n";
+
+
+function insert_ipkgs(&$package_info)
+{
+    db_query_n("INSERT INTO packages VALUES (
+	'{$package_info['name']}', '{$package_info['version']}',
+	'{$package_info['arch']}', '{$package_info['depends']}',
+	'{$package_info['maintainer']}',  '{$package_info['homepage']}',
+	'{$package_info['section']}',  '{$package_info['replaces']}',
+	'{$package_info['provides']}', '{$package_info['recommends']}',
+	'{$package_info['conflicts']}', '{$package_info['size']}',
+	'{$package_info['md5sum']}', '{$package_info['source']}',
+	'{$package_info['feed']}', '{$package_info['file']}',
+	'{$package_info['desc']}'
+    )");
+}
+
+?>
diff --git a/contrib/mtnpatch.py b/contrib/mtnpatch.py
deleted file mode 100755
index 73143dba69..0000000000
--- a/contrib/mtnpatch.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-import sys, os, string, getopt, re
-
-mtncmd = "monotone"
-
-def main(argv = None):
-    if argv is None:
-        argv = sys.argv
-    opts, list = getopt.getopt(sys.argv[1:], ':R')
-    if len(list) < 1:
-        print "You must specify a file"
-        return 2
-    reverse = False
-    for o, a in opts:
-        if o == "-R":
-            reverse = True
-    if os.path.exists(list[0]):
-        input = open(list[0], 'r')
-        renameFrom = ""
-        cmd = ""
-        if reverse:
-            print "patch -R -p0 < %s" % list[0]
-        else:
-            print "patch -p0 < %s" % list[0]
-        for line in input:
-            if len(line) > 0:
-                if line[0] == '#':
-                    matches = re.search("#\s+(\w+)\s+\"(.*)\"", line)
-                    if matches is not None:
-                        cmd = matches.group(1)
-                        fileName = matches.group(2)
-                        if cmd == "delete_file":
-                            if reverse:
-                                print "%s add %s" % (mtncmd, fileName)
-                            else:
-                                print "%s drop -e %s" % (mtncmd, fileName)
-                        elif cmd == "add_file":
-                            if reverse:
-                                print "%s drop -e %s" % (mtncmd, fileName)
-                            else:
-                                print "%s add %s" % (mtncmd, fileName)
-                        elif cmd == "rename_file":
-                            renameFrom = fileName
-                        elif cmd == "to" and renameFrom != "":
-                            if reverse:
-                                print "%s rename -e %s %s" % (mtncmd, fileName, renameFrom)
-                            else:
-                                print "%s rename -e %s %s" % (mtncmd, renameFrom, fileName)
-                            renameFrom = ""
-                        else:
-                            cmd = ""
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/packages/tin/tin-1.7.3/.mtn2git_empty b/contrib/python/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tin/tin-1.7.3/.mtn2git_empty
+++ b/contrib/python/.mtn2git_empty
diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py
new file mode 100755
index 0000000000..2fd681dc01
--- /dev/null
+++ b/contrib/python/generate-manifest.py
@@ -0,0 +1,326 @@
+#!/usr/bin/env python
+
+# generate Python Manifest for the OpenEmbedded build system
+# (C) 2002-2006 Michael Lauer <mickey@Vanille.de>
+# MIT license
+
+import os
+import sys
+import time
+
+VERSION = "2.4.3"
+# increase when touching python-core
+BASEREV = 0
+
+__author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+__version__ = "$Revision: 1.20 $"
+
+class MakefileMaker:
+
+    def __init__( self, outfile ):
+        """initialize"""
+        self.packages = {}
+        self.sourcePrefix = "/lib/python%s/" % VERSION[:3]
+        self.targetPrefix = "${libdir}/python%s" % VERSION[:3]
+        self.output = outfile
+        self.out( "#" * 120 )
+        self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) )
+        self.out( "###" )
+        self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" )
+        self.out( "###" )
+        self.out( "### Warning: Manual edits will be lost!" )
+        self.out( "###" )
+        self.out( "#" * 120 )
+    #
+    # helper functions
+    #
+
+    def out( self, data ):
+        """print a line to the output file"""
+        print >> self.output, data
+
+    def setPrefix( self, sourcePrefix, targetPrefix ):
+        """set a file prefix for addPackage files"""
+        self.sourcePrefix = sourcePrefix
+        self.targetPrefix = targetPrefix
+
+    def doProlog( self ):
+        self.out( """ """ )
+        self.out( "" )
+
+    def addPackage( self, revision, name, description, dependencies, filenames ):
+        """add a package to the Makefile"""
+        if type( filenames ) == type( "" ):
+            filenames = filenames.split()
+        fullFilenames = []
+        for filename in filenames:
+            if filename[0] != "/":
+                fullFilenames.append( ( "%s%s" % ( self.sourcePrefix, filename ), "%s%s" % ( self.targetPrefix, filename ) ) )
+            else:
+                fullFilenames.append( ( filename, filename ) )
+        self.packages[name] = revision, description, dependencies, fullFilenames
+
+    def doBody( self ):
+        """generate body of Makefile"""
+
+        global VERSION
+
+        #
+        # generate provides line
+        # 
+ 
+        provideLine = 'PROVIDES+="'
+        for name in self.packages:
+            provideLine += "%s " % name
+        provideLine += '"'
+
+        self.out( provideLine )
+        self.out( "" )       
+
+        #
+        # generate package line
+        #
+
+        packageLine = 'PACKAGES="'
+        for name in self.packages:
+            packageLine += "%s " % name
+        packageLine += '"'
+
+        self.out( packageLine )
+        self.out( "" )
+
+        #
+        # generate package variables
+        #
+
+        for name, data in self.packages.iteritems():
+            rev, desc, deps, files = data
+
+            #
+            # write out the description, revision and dependencies
+            #
+            self.out( 'DESCRIPTION_%s="%s"' % ( name, desc ) )
+            self.out( 'PR_%s="ml%d"' % ( name, rev + BASEREV ) )
+            self.out( 'RDEPENDS_%s="%s"' % ( name, deps.replace( ",", "" ) ) )
+
+            line = 'FILES_%s="' % name
+
+            #
+            # check which directories to make in the temporary directory
+            #
+
+            dirset = {} # if python had a set-datatype this would be sufficient. for now, we're using a dict instead.
+            for source, target in files:
+                dirset[os.path.dirname( target )] = True
+
+            #
+            # generate which files to copy for the target (-dfR because whole directories are also allowed)
+            #
+
+            for source, target in files:
+                line += "%s " % target
+
+            line += '"'
+            self.out( line )
+
+#            for source, target in files:
+#                if ( source.find( "lib-dynload" ) != -1 ) or \
+#                  ( source.endswith( "python" ) ) or \
+#                   ( source.endswith( "pydoc" ) ): # MACHDEP
+#                    self.out( "\t cp -dfR $(STAGING_LIBDIR)/..%s $(IPKTMP_DIR)%s/;" % ( source, os.path.dirname( target ) ) )
+#                else:
+#                    self.out( "\t cp -dfR $(STAGING_DIR)%s $(IPKTMP_DIR)%s/;" % ( source, os.path.dirname( target ) ) )
+#
+            self.out( "" )
+
+    def doEpilog( self ):
+        self.out( """""" )
+        self.out( "" )
+
+    def make( self ):
+        self.doProlog()
+        self.doBody()
+        self.doEpilog()
+
+if __name__ == "__main__":
+
+    if len( sys.argv ) > 1:
+        os.popen( "rm -f ./%s" % sys.argv[1] )
+        outfile = file( sys.argv[1], "w" )
+    else:
+        outfile = sys.stdout
+
+    m = MakefileMaker( outfile )
+
+    # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies!
+    # Parameters: revision, name, description, dependencies, filenames
+    #
+
+    m.setPrefix( "/", "/usr/" )
+
+    m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "",
+    "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " +
+    "lib/python2.4/getopt.* lib/python2.4/linecache.* lib/python2.4/new.* " +
+    "lib/python2.4/os.* lib/python2.4/posixpath.* " +
+    "lib/python2.4/warnings.* lib/python2.4/site.* lib/python2.4/stat.* " +
+    "lib/python2.4/UserDict.* lib/python2.4/UserList.* lib/python2.4/UserString.* " +
+    "lib/python2.4/lib-dynload/binascii.so lib/python2.4/lib-dynload/struct.so lib/python2.4/lib-dynload/time.so " +
+    "lib/python2.4/lib-dynload/xreadlines.so lib/python2.4/types.* bin/python" )
+
+    m.addPackage( 0, "python-devel", "Python Development Package", "python-core",
+    "include lib/python2.4/config" ) # package
+
+    m.addPackage( 0, "python-idle", "Python Integrated Development Environment", "python-core, python-tkinter",
+    "bin/idle lib/python2.4/idlelib" ) # package
+
+    m.addPackage( 0, "python-pydoc", "Python Interactive Help Support", "python-core, python-lang, python-stringold, python-re",
+    "bin/pydoc lib/python2.4/pydoc.*" )
+
+    m.setPrefix( "/lib/python2.4/", "${libdir}/python2.4/" )
+
+    m.addPackage( 0, "python-audio", "Python Audio Handling", "python-core",
+    "wave.* chunk.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" )
+
+    m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core",
+    "bsddb" ) # package
+
+    m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core",
+    "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
+
+    m.addPackage( 0, "python-compile", "Python Bytecode Compilation Support", "python-core",
+    "py_compile.* compileall.*" )
+
+    m.addPackage( 0, "python-compiler", "Python Compiler Support", "python-core",
+    "compiler" ) # package
+
+    m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core, python-zlib",
+    "gzip.* zipfile.*" )
+
+    m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
+    "lib-dynload/crypt.so lib-dynload/md5.so lib-dynload/rotor.so lib-dynload/sha.so" )
+
+    m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold",
+    "lib-dynload/_csv.so csv.* optparse.* textwrap.*" )
+
+    m.addPackage( 1, "python-curses", "Python Curses Support", "python-core",
+    "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package
+
+    m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core, python-codecs",
+    "_strptime.* calendar.* lib-dynload/datetime.so" )
+
+    m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core",
+    "anydbm.* dumbdbm.* whichdb.* " )
+
+    m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core",
+    "config distutils" ) # package
+
+    m.addPackage( 0, "python-email", "Python Email Support", "python-core, python-io, python-re",
+    "email" ) # package
+
+    m.addPackage( 0, "python-fcntl", "Python's fcntl Interface", "python-core",
+    "lib-dynload/fcntl.so" )
+
+    m.addPackage( 0, "python-hotshot", "Python Hotshot Profiler", "python-core",
+    "hotshot lib-dynload/_hotshot.so" )
+
+    m.addPackage( 0, "python-html", "Python HTML Processing", "python-core",
+    "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " )
+
+    m.addPackage( 0, "python-gdbm", "Python GNU Database Support", "python-core, libgdbm3",
+    "lib-dynload/gdbm.so" )
+
+    m.addPackage( 0, "python-image", "Python Graphical Image Handling", "python-core",
+    "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" )
+
+    m.addPackage( 0, "python-io", "Python Low-Level I/O", "python-core, python-math",
+    "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so "
+    "pipes.* socket.* tempfile.* StringIO.* " )
+
+    m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core",
+    "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " +
+    "lib-dynload/itertools.so lib-dynload/collections.so " +
+    "atexit.* code.* codeop.* dis.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* traceback.* linecache.* weakref.*" )
+
+    m.addPackage( 0, "python-logging", "Python Logging Support", "python-core",
+    "logging" ) # package
+
+    m.addPackage( 0, "python-lib-old-and-deprecated", "Python Deprecated Libraries", "python-core",
+    "lib-old" ) # package
+
+    m.addPackage( 0, "python-tkinter", "Python Tcl/Tk Bindings", "python-core",
+    "lib-dynload/_tkinter.so lib-tk" ) # package
+
+    m.addPackage( 0, "python-math", "Python Math Support", "python-core",
+    "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" )
+
+    m.addPackage( 0, "python-mime", "Python MIME Handling APIs", "python-core, python-io",
+    "mimetools.* quopri.* rfc822.*" )
+
+    m.addPackage( 0, "python-mmap", "Python Memory-Mapped-File Support", "python-core, python-io",
+    "lib-dynload/mmap.so " )
+
+    m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core",
+    "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
+
+    m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime",
+    "*Cookie*.* " + 
+    "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" )
+
+    m.addPackage( 0, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient",
+    "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" )
+
+    m.addPackage( 0, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-re",
+    "pickle.* shelve.* lib-dynload/cPickle.so" )
+
+    m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core",
+    "pprint.*" )
+
+    m.addPackage( 0, "python-profile", "Python Basic Profiling Support", "python-core",
+    "profile.* pstats.*" )
+
+    m.addPackage( 0, "python-re", "Python Regular Expression APIs", "python-core",
+    "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin
+
+    m.addPackage( 0, "python-readline", "Python Readline Support", "python-core, libreadline4",
+    "lib-dynload/readline.so rlcompleter.*" )
+
+    m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core",
+    "lib-dynload/resource.so" )
+
+    m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core, python-re",
+    "commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" )
+
+    m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core, python-io, python-re",
+    "subprocess.*" )
+
+    m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core, python-re",
+    "lib-dynload/strop.so string.*" )
+
+    m.addPackage( 0, "python-syslog", "Python's syslog Interface", "python-core",
+    "lib-dynload/syslog.so" )
+
+    m.addPackage( 0, "python-terminal", "Python Terminal Controlling Support", "python-core, python-io",
+    "pty.* tty.*" )
+
+    m.addPackage( 0, "python-tests", "Python Tests", "python-core",
+    "test" ) # package
+
+    m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang",
+    "_threading_local.* bisect.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" )
+
+    m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang",
+    "unittest.*" )
+
+    m.addPackage( 0, "python-xml", "Python basic XML support.", "python-core, python-re",
+    "lib-dynload/pyexpat.so xml xmllib.*" ) # package
+
+    m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang",
+    "xmlrpclib.* SimpleXMLRPCServer.*" )
+
+    m.addPackage( 1, "python-zlib", "Python zlib Support.", "python-core",
+    "lib-dynload/zlib.so" )
+
+    m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core, python-mime",
+    "mailbox.*" )
+
+    m.make()
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index fbf1442771..ebfd793f9b 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -25,8 +25,9 @@ do_stage() {
 	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
 }
 
-PACKAGES += "libasound alsa-server alsa-conf alsa-doc alsa-dev"
+PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
 PACKAGES_DYNAMIC = "libasound*"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so*"
 FILES_alsa-server = "${bindir}"
 FILES_alsa-conf = "${datadir}"
diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb
index 10ebacee9b..d2acfe1995 100644
--- a/packages/alsa/alsa-utils_1.0.11.bb
+++ b/packages/alsa/alsa-utils_1.0.11.bb
@@ -40,7 +40,7 @@ FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
 DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
 DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
 DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
-#DESCRIPTION_alsa-utils-speaker-test= "??"
+DESCRIPTION_alsa-utils-speaker-test = "speaker test tone generator for ALSA"
 DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
 DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
 DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
@@ -50,5 +50,6 @@ DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configura
 RDEPENDS_alsa-utils-aplay  += "alsa-conf"
 RDEPENDS_alsa-utils-amixer += "alsa-conf"
 RDEPENDS_alsa-utils-alsamixer += "alsa-conf"
+RDEPENDS_alsa-utils-speaker-test += "alsa-conf"
 
 ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
new file mode 100644
index 0000000000..55d644bc15
--- /dev/null
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -0,0 +1,118 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r19"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "task-angstrom"
+
+PACKAGES = "\
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    angstrom-gpe-task-pim \
+    angstrom-gpe-task-apps \
+    angstrom-gpe-task-games \ 
+    angstrom-task-office \
+    angstrom-task-printing \
+    angstrom-task-sectest"
+
+RDEPENDS_angstrom-x11-base-depends := "\
+    virtual/libx11 \
+    virtual/xserver \
+    ttf-dejavu-sans \
+    ttf-dejavu-sans-mono \
+    "
+
+RDEPENDS_angstrom-gpe-task-base := "\
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    libgtkstylus \
+    libgtkinput \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+RDEPENDS_angstrom-gpe-task-pim := "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-contacts \
+    gpesyncd"
+
+RDEPENDS_angstrom-gpe-task-settings := "\
+    matchbox-panel-manager \
+    gpe-su \
+    gpe-conf \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    minilite \
+    minimix \
+    xmonobut"
+
+RDEPENDS_angstrom-gpe-task-apps := "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    gpe-soundbite \
+    rosetta \
+    gpe-screenshot \
+    gpe-windowlist"
+
+RDEPENDS_angstrom-gpe-task-games := "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+    xdemineur"
+
+RDEPENDS_angstrom-task-office := "\
+    gnumeric \
+    abiword \
+    imposter \
+#    evince \
+    gqview"
+
+RDEPENDS_angstrom-task-printing := "\
+    cups \
+    gnome-cups-manager"
+
+RDEPENDS_angstrom-task-sectest := "\
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+#    dsniff \
+    prismstumbler \
+#    tcpdump \
+    kismet \
+    hydra \
+    thcrut \
+#    driftnet \
+    miniclipboard"
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index c8c84c3e5e..9f31f0b640 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r17"
+PR = "r19"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -12,20 +12,11 @@ PCMCIA_MANAGER ?= "pcmciautils"
 
 PACKAGES = "\
     angstrom-base-depends \
-    angstrom-base-wifi \
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    angstrom-gpe-task-pim \
-    angstrom-gpe-task-apps \
-    angstrom-gpe-task-games \ 
-    angstrom-task-office \
-    angstrom-task-printing \
-    angstrom-task-sectest"
+    angstrom-base-wifi "
 
 RDEPENDS_angstrom-base-depends = "\
     base-files keymaps \
-    base-passwd tinylogin \ 
+    base-passwd tinylogin \
     busybox \
     udev \
     update-modules module-init-tools modutils-initscripts \
@@ -33,132 +24,44 @@ RDEPENDS_angstrom-base-depends = "\
     netbase dropbear \
     angstrom-version \
     ipkg ipkg-collateral \
-    wireless-tools \
     tslib-tests tslib-calibrate \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
-    ${PCMCIA_MANAGER} \	
+    ${PCMCIA_MANAGER} \
+    angstrom-base-wifi \
 "
 
 RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware "
-
+RDEPENDS_angstrom-base-depends_append_h4000 = " tiinit acx-firmware "
+RDEPENDS_angstrom-base-depends_append_htcuniversal = " tiinit acx-firmware "
 
 RRECOMMENDS_angstrom-base-depends = "\
-        ${BOOTMODULES_RRECOMMENDS} \
-	kernel-module-evdev \
-	kernel-module-uinput \
-	kernel-module-g-ether \
-	kernel-module-hostap-cs \
-	kernel-module-af-packet \
-	"
+    ${BOOTMODULES_RRECOMMENDS} \
+    kernel-module-evdev \
+    kernel-module-uinput \
+    kernel-module-g-ether \
+    kernel-module-af-packet \
+"
 
 RDEPENDS_angstrom-base-wifi = "\
     hostap-utils \
     hostap-conf \
     prism3-support \
     prism3-firmware \
-    acx-firmware \
     wireless-tools \
     wpa-supplicant \
-    "
-
-RDEPENDS_angstrom-x11-base-depends := "\
-    virtual/libx11 \
-    virtual/xserver \
-    ttf-dejavu-sans \
-    ttf-dejavu-sans-mono \
-    "
-
-RDEPENDS_angstrom-gpe-task-base := "\
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    matchbox-themes-gtk \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    libgtkinput \
-    suspend-desktop \
-    teleport \
-    xauth \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_angstrom-gpe-task-pim := "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-contacts \
-    gpesyncd"
-
-RDEPENDS_angstrom-gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-su \
-    gpe-conf \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    minilite \
-    minimix \
-    xmonobut"
-
-RDEPENDS_angstrom-gpe-task-apps := "\
-    gpe-edit \
-    gpe-gallery \
-    gpe-calculator \
-    gpe-clock \
-    gpe-plucker \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    gpe-soundbite \
-    rosetta \
-    gpe-screenshot \
-    gpe-windowlist"
-
-RDEPENDS_angstrom-gpe-task-games := "\
-    gpe-go \
-    gpe-lights \
-    gpe-othello \
-    gpe-tetris \
-    gsoko \
-    xdemineur"
-
-RDEPENDS_angstrom-task-office := "\
-    gnumeric \
-    abiword \
-    imposter \
-    evince \
-    gqview"
-
-RDEPENDS_angstrom-task-printing := "\
-    cups \
-    gnome-cups-manager"
+"
 
-RDEPENDS_angstrom-task-sectest := "\
-    nmap \
-    ettercap \
-    stunnel \
-    curl \
-    dsniff \
-    prismstumbler \
-    tcpdump \
-    kismet \
-    hydra \
-    thcrut \
-    driftnet \
-    miniclipboard"
+RRECOMMENDS_angstrom-base-wifi = "\
+    kernel-module-hostap-cs \
+    kernel-module-orinoco-cs \
+    kernel-module-spectrum-cs \
+    kernel-module-arc4 \
+    kernel-module-michael-mic \
+    kernel-module-aes \
+    kernel-module-ieee80211-crypt-tkip \
+    kernel-module-ieee80211-crypt-wep \
+    kernel-module-ieee80211-crypt \
+    kernel-module-ieee80211-crypt-ccmp \
+"
diff --git a/packages/atk/atk_1.10.1.bb b/packages/atk/atk_1.10.3.bb
index 6424167ca2..d04b943557 100644
--- a/packages/atk/atk_1.10.1.bb
+++ b/packages/atk/atk_1.10.3.bb
@@ -2,7 +2,6 @@ DEPENDS = "glib-2.0 gtk-doc"
 DESCRIPTION = "An accessibility toolkit for GNOME."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2"
diff --git a/packages/autoconf/autoconf-native_2.59.bb b/packages/autoconf/autoconf-native_2.59.bb
index 347cd354cf..92a9257797 100644
--- a/packages/autoconf/autoconf-native_2.59.bb
+++ b/packages/autoconf/autoconf-native_2.59.bb
@@ -2,7 +2,6 @@ SECTION = "devel"
 require autoconf_${PV}.bb
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
-RRECOMMENDS_${PN} = ""
 
 S = "${WORKDIR}/autoconf-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
diff --git a/packages/autoconf/autoconf_2.57.bb b/packages/autoconf/autoconf_2.57.bb
index 86059aa355..48726b1605 100644
--- a/packages/autoconf/autoconf_2.57.bb
+++ b/packages/autoconf/autoconf_2.57.bb
@@ -5,6 +5,5 @@ DESCRIPTION = "A package of M4 macros to produce scripts to \
 automatically configure sourcecode." 
 
 PR = "r1"
-RRECOMMENDS_${PN} = "automake"
 SECTION = "devel"
 inherit autotools
diff --git a/packages/autoconf/autoconf_2.59.bb b/packages/autoconf/autoconf_2.59.bb
index 505b2bec9e..3a5c220a48 100644
--- a/packages/autoconf/autoconf_2.59.bb
+++ b/packages/autoconf/autoconf_2.59.bb
@@ -5,7 +5,6 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
 SECTION = "devel"
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 gnu-config"
-RRECOMMENDS_${PN} = "automake"
 PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb
index 2b12d91c8d..803266b6b3 100644
--- a/packages/avahi/avahi_0.6.10.bb
+++ b/packages/avahi/avahi_0.6.10.bb
@@ -5,6 +5,7 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
+PR = "r1"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -42,6 +43,8 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 pkg_postinst_avahi-daemon () {
 	if [ "x$D" != "x" ]; then
 		exit 1
@@ -49,7 +52,12 @@ pkg_postinst_avahi-daemon () {
 
 	grep avahi /etc/group || addgroup avahi
 	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
 }
 
 pkg_postrm_avahi-daemon () {
diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb
index 2b12d91c8d..cc32ad883f 100644
--- a/packages/avahi/avahi_0.6.11.bb
+++ b/packages/avahi/avahi_0.6.11.bb
@@ -5,6 +5,7 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
+PR="r1"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -42,6 +43,8 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 pkg_postinst_avahi-daemon () {
 	if [ "x$D" != "x" ]; then
 		exit 1
@@ -49,10 +52,15 @@ pkg_postinst_avahi-daemon () {
 
 	grep avahi /etc/group || addgroup avahi
 	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
 }
 
-pkg_postrm_avahi-daemon () {
+_postrm_avahi-daemon () {
 	deluser avahi || true
 	delgroup avahi || true
 }
diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb
index 2072c1f6bf..44e7c543ae 100644
--- a/packages/avahi/avahi_0.6.12.bb
+++ b/packages/avahi/avahi_0.6.12.bb
@@ -5,7 +5,7 @@ AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
 MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "expat libdaemon dbus"
 RRECOMMENDS = "libnss-mdns"
@@ -48,10 +48,17 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
 pkg_postinst_avahi-daemon () {
 	grep avahi /etc/group || addgroup avahi
 	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
 }
 
 pkg_postrm_avahi-daemon () {
diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb
new file mode 100644
index 0000000000..0898bf036c
--- /dev/null
+++ b/packages/avahi/avahi_0.6.13.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+SECTION = "network"
+PRIORITY = "optional"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
+HOMEPAGE = "http://avahi.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
+LICENSE= "GPL"
+PR = "r1"
+
+DEPENDS = "expat libdaemon dbus"
+RRECOMMENDS = "libnss-mdns"
+
+SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
+
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+		      ${sysconfdir}/avahi/avahi-daemon.conf \
+		      ${sysconfdir}/avahi/hosts \
+		      ${sysconfdir}/avahi/services \
+		      ${sysconfdir}/dbus-1 \
+		      ${sysconfdir}/init.d/avahi-daemon \
+		      ${datadir}/avahi/introspection/*.introspect \
+		      ${datadir}/avahi/avahi-service.dtd \
+		      ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+			${sysconfdir}/avahi/avahi-dnsconfd.action \
+			${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_avahi-utils = "${bindir}/avahi-*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+inherit autotools pkgconfig update-rc.d
+
+
+do_stage() {
+	autotools_stage_all
+}
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
+pkg_postinst_avahi-daemon () {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+	grep avahi /etc/group || addgroup avahi
+	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
+}
+
+pkg_postrm_avahi-daemon () {
+	deluser avahi || true
+	delgroup avahi || true
+}
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
new file mode 100644
index 0000000000..8472e0e0ce
--- /dev/null
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
+SECTION = "devel"
+DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/avetanabt/avetanaBluetooth-${PV}.tgz"
+
+S = "${WORKDIR}/avetanabt"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/libavetanaBT.so ${datadir}/avetanabt/avetanaBT.jar"
+
+do_compile() {
+
+  # doing nearly the same as in Makefile written...
+
+  # clean build directory
+  mkdir -p build
+  rm -fr build/*
+
+  # generate classes
+  # javac -> jikes
+  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
+  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+
+  # create own version.xml (add version information available at runtime)
+  head -n 4 version.xml >> build/version.xml
+  echo "    <build value=\"cvs${SRCDATE}\" date=\"${SRCDATE}\" time=\"${@time.strftime('%H:%M',time.gmtime())}\"/>" >> build/version.xml
+  tail -n 3 version.xml >> build/version.xml
+
+  # move classes into jar archive
+  # jar -> fastjar
+  ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
+  
+  # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
+  # javah -> kaffeh
+  ${STAGING_BINDIR}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+
+  # Native language (C) library - libavetanaBT.so
+  ${CXX} ${CXXFLAGS}  -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
+
+}
+
+do_stage() {
+
+  install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
+  install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+
+}
+
+do_install() {
+
+  install -d ${D}${libdir}
+  install -m 0755 libavetanaBT.so ${D}${libdir}/
+
+  install -d ${D}${datadir}/avetanabt
+  install avetanaBT.jar ${D}${datadir}/avetanabt/
+ 
+}
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index 7f6bea2a20..c25699caf0 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -5,10 +5,12 @@ MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 
-PV = "0.0+cvs${SRCDATE}"
-PR = "r3"
+DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt"
+PV = "20060413+cvs${SRCDATE}"
+PR = "r5"
+
+SRC_URI = "cvs://anonymous@avetanabt.cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt"
 
 S = "${WORKDIR}/avetanabt"
 
diff --git a/packages/bluez/bluez-libs_3.4.bb b/packages/bluez/bluez-libs_3.4.bb
new file mode 100644
index 0000000000..d740bd80a9
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
+SECTION = "libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
+
+do_stage() {
+        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
+
+        install -d ${STAGING_INCDIR}/bluetooth/
+        for f in ${HEADERS}
+        do
+		install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
+        done
+}
diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb
new file mode 100644
index 0000000000..3b8702e997
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.4.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs-${PV} dbus"
+PROVIDES = "bluez-utils-dbus"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
+RREPLACES = "bluez-utils-dbus"
+RCONFLICTS_${PN} = "bluez-utils-nodbus"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://hcid.conf \
+	file://02dtl1_cs.sh \
+	file://hciattach-ti-bts.patch;patch=1"
+
+# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
+# Let's default to that instead of 'any' until further notice...
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
+
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x"
+#  --enable-obex           enable OBEX support
+#  --enable-alsa           enable ALSA support
+#  --enable-cups           install CUPS backend support
+#  --enable-bccmd          install BCCMD interface utility
+#  --enable-avctrl         install Audio/Video control utility
+#  --enable-hid2hci        install HID mode switching utility
+#  --enable-dfutool        install DFU firmware upgrade utility
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+do_install_append() {
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/  ${D}${sysconfdir}/apm/event.d/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
+	${sysconfdir}/default/bluetooth"
+
+PACKAGES =+ "${PN}-ciptool"
+FILES_${PN}-ciptool = "/bin/ciptool"
+RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
+RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 8b399f1626..741df3f62d 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -74,7 +74,7 @@ do_install () {
 	install -d ${D}/busybox
 	ls ${D} -R
 
-	mv ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
 	# Move the busybox binary back to /bin
 	install -d ${D}${base_bindir}
 	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb
new file mode 100644
index 0000000000..bad6da8bde
--- /dev/null
+++ b/packages/cairo/cairo_1.2.4.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "libx11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://cairo-fixed.patch;patch=1"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/cairo/files/.mtn2git_empty b/packages/cairo/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cairo/files/.mtn2git_empty
diff --git a/packages/cairo/files/cairo-fixed.patch b/packages/cairo/files/cairo-fixed.patch
new file mode 100644
index 0000000000..8df54d9cb5
--- /dev/null
+++ b/packages/cairo/files/cairo-fixed.patch
@@ -0,0 +1,43 @@
+diff -ur cairo-1.2.4/src/cairo-fixed.c cairo-1.2.4-new/src/cairo-fixed.c
+--- cairo-1.2.4/src/cairo-fixed.c	2006-06-10 07:07:37.000000000 +0300
++++ cairo-1.2.4-new/src/cairo-fixed.c	2006-08-25 13:06:26.000000000 +0300
+@@ -43,12 +43,6 @@
+ }
+ 
+ cairo_fixed_t
+-_cairo_fixed_from_double (double d)
+-{
+-    return (cairo_fixed_t) floor (d * 65536 + 0.5);
+-}
+-
+-cairo_fixed_t
+ _cairo_fixed_from_26_6 (uint32_t i)
+ {
+     return i << 10;
+diff -ur cairo-1.2.4/src/cairoint.h cairo-1.2.4-new/src/cairoint.h
+--- cairo-1.2.4/src/cairoint.h	2006-08-18 17:20:16.000000000 +0300
++++ cairo-1.2.4-new/src/cairoint.h	2006-08-25 13:14:07.000000000 +0300
+@@ -1117,8 +1117,21 @@
+ 
+ #define CAIRO_FIXED_ONE _cairo_fixed_from_int (1)
+ 
+-cairo_private cairo_fixed_t
+-_cairo_fixed_from_double (double d);
++#define CAIRO_DOUBLE2FIX_MAGIC 103079215104.0 /* 2 ^ (52 - 16) * 1.5 */
++
++#ifdef WORDS_BIGENDIAN
++#define iman 1
++#else
++#define iman 0
++#endif
++
++static inline cairo_fixed_t
++_cairo_fixed_from_double (double d)
++{
++        d = d + CAIRO_DOUBLE2FIX_MAGIC;
++        
++        return ((cairo_fixed_t *) &d)[iman];
++}
+ 
+ cairo_private cairo_fixed_t
+ _cairo_fixed_from_26_6 (uint32_t i);
diff --git a/packages/db/db-native_4.3.29.bb b/packages/db/db-native_4.3.29.bb
index 12a875ff13..aac4e2021b 100644
--- a/packages/db/db-native_4.3.29.bb
+++ b/packages/db/db-native_4.3.29.bb
@@ -10,4 +10,8 @@ inherit native
 
 require db_${PV}.bb
 
+do_package() {
+:
+}
+
 PACKAGES = ""
diff --git a/packages/dbus/dbus-glib-native/.mtn2git_empty b/packages/dbus/dbus-glib-native/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dbus/dbus-glib-native/.mtn2git_empty
diff --git a/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
new file mode 100644
index 0000000000..186abdb56b
--- /dev/null
+++ b/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
@@ -0,0 +1,32 @@
+--- dbus-glib-0.71/tools/Makefile.am.orig	2006-08-27 12:54:34.351198198 +0200
++++ dbus-glib-0.71/tools/Makefile.am	2006-08-27 12:55:12.533584373 +0200
+@@ -9,7 +9,7 @@
+ BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
+ 
+ dbus-bus-introspect.xml:
+-	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
++	DBUS_TOP_BUILDDIR=$(top_builddir) ./run-with-tmp-session-bus.sh dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+ 
+ EXTRA_DIST = run-with-tmp-session-bus.sh
+ 
+--- dbus-glib-0.71/tools/run-with-tmp-session-bus.sh.orig	2006-08-27 11:52:17.497666746 +0200
++++ dbus-glib-0.71/tools/run-with-tmp-session-bus.sh	2006-08-27 12:53:22.626715838 +0200
+@@ -27,16 +27,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+ 
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_BUILDDIR/tools/session.conf |  \
++cat $datadir/dbus/session.conf |  \
+     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
+     sed -e 's/<include.*$//g'                \
+   > $CONFIG_FILE
+ 
+ echo "Created configuration file $CONFIG_FILE" >&2
+ 
+-export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+ ## the libtool script found by the path search should already do this, but
+-export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ 
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DBUS_SESSION_BUS_PID
diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb
index 81a15c9b35..1f5d71da91 100644
--- a/packages/dbus/dbus-glib-native_0.71.bb
+++ b/packages/dbus/dbus-glib-native_0.71.bb
@@ -3,16 +3,16 @@ PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch;patch=1 \
+	   file://run-with-tmp-session-bus.patch;patch=1"
 
 inherit autotools pkgconfig gettext native
 
 S = "${WORKDIR}/dbus-glib-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib"
-DEPENDS = "glib-2.0-native"
+DEPENDS = "glib-2.0-native dbus-native"
 
 do_stage() {
         oe_runmake install
diff --git a/packages/dbus/dbus-glib_0.71.bb b/packages/dbus/dbus-glib_0.71.bb
index 6bb69ba316..26bc851098 100644
--- a/packages/dbus/dbus-glib_0.71.bb
+++ b/packages/dbus/dbus-glib_0.71.bb
@@ -3,7 +3,7 @@ PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus-native_0.92.bb b/packages/dbus/dbus-native_0.92.bb
new file mode 100644
index 0000000000..d7823889cd
--- /dev/null
+++ b/packages/dbus/dbus-native_0.92.bb
@@ -0,0 +1,28 @@
+SECTION = "base"
+PR = "r0"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+
+S = "${WORKDIR}/dbus-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
+DEPENDS = "glib-2.0-native"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   file://tmpdir.patch;patch=1"
+
+inherit autotools pkgconfig gettext native
+
+EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
+		--disable-checks --disable-xml-docs --disable-doxygen-docs \
+		--with-xml=expat --without-x"
+
+do_stage () {
+	oe_runmake install
+	autotools_stage_all
+
+	# for dbus-glib-native introspection generation
+	install -d ${STAGING_DATADIR}/dbus
+	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb
index a4ab61322f..7981a3f525 100644
--- a/packages/dbus/dbus_0.92.bb
+++ b/packages/dbus/dbus_0.92.bb
@@ -1,12 +1,11 @@
-DEFAULT_PREFERENCE="-1"
-
 SECTION = "base"
-PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
+PR = "r1"
+
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
 	   file://tmpdir.patch;patch=1 \
diff --git a/packages/dhcdbd/.mtn2git_empty b/packages/dhcdbd/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dhcdbd/.mtn2git_empty
diff --git a/packages/dhcdbd/dhcdbd_1.14.bb b/packages/dhcdbd/dhcdbd_1.14.bb
new file mode 100644
index 0000000000..3194942e4e
--- /dev/null
+++ b/packages/dhcdbd/dhcdbd_1.14.bb
@@ -0,0 +1,26 @@
+DESCRIPTION="DBus-enabled dhcp client"
+SECTION="net"
+LICENSE="GPL"
+HOMEPAGE="http://people.redhat.com/jvdias/dhcdbd/"
+MAINTAINER="Milan Plzik <mmp@handhelds.org>"
+
+DEPENDS = "dbus"
+
+PR = "r1"
+
+SRC_URI="http://people.redhat.com/jvdias/dhcdbd/dhcdbd-${PV}.tar.gz \
+         file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \
+	 file://dbus-api-fix.patch;patch=1 \
+	 file://dhcdbd"
+
+do_compile() {
+	CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make
+}
+
+do_install() {
+	DESTDIR=${D} make install
+	install -d ${D}/etc/init.d
+	install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/
+}
+
+FILES_${PN} += "${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}/*"
diff --git a/packages/dhcdbd/files/.mtn2git_empty b/packages/dhcdbd/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dhcdbd/files/.mtn2git_empty
diff --git a/packages/dhcdbd/files/dbus-api-fix.patch b/packages/dhcdbd/files/dbus-api-fix.patch
new file mode 100644
index 0000000000..ce05fc7bf8
--- /dev/null
+++ b/packages/dhcdbd/files/dbus-api-fix.patch
@@ -0,0 +1,20 @@
+--- /tmp/dbus_service.c	2006-08-24 22:09:14.000000000 +0200
++++ dhcdbd-1.14/dbus_service.c	2006-08-24 22:09:44.228306000 +0200
+@@ -1412,7 +1412,7 @@
+     return ( cs );
+ 
+  give_up:
+-    dbus_connection_disconnect( connection );
++    dbus_connection_close( connection );
+     dbus_shutdown();
+     return ( 0L );
+ }
+@@ -1456,7 +1456,7 @@
+     cs->roots=0L;
+ 
+ 
+-    dbus_connection_disconnect( cs->connection );
++    dbus_connection_close( cs->connection );
+     dbus_shutdown();
+     free( cs );
+ }
diff --git a/packages/dhcdbd/files/dhcdbd b/packages/dhcdbd/files/dhcdbd
new file mode 100755
index 0000000000..568753c28c
--- /dev/null
+++ b/packages/dhcdbd/files/dhcdbd
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# DHCDBD startup script
+
+. /etc/profile
+
+case $1 in
+  'start')
+    echo -n "Starting dhcdbd daemon: dhcdbd"
+    /sbin/dhcdbd --system
+    echo "."
+  ;;
+
+  'stop')
+    echo -n "Stopping dhcdbd: dhcdbd"
+    killall `ps |grep  /sbin/dhcdbd | grep -v grep | cut "-d " -f2`
+    echo "."
+  ;;
+
+  'restart')
+    $0 stop
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: $0 { start | stop | restart }"
+  ;;
+esac
diff --git a/packages/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch b/packages/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch
new file mode 100644
index 0000000000..c2e2151d17
--- /dev/null
+++ b/packages/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch
@@ -0,0 +1,26 @@
+diff -Naur dhcdbd-1.14/Makefile dhcdbd-1.14-mod/Makefile
+--- dhcdbd-1.14/Makefile	2006-01-17 22:23:51.000000000 +0100
++++ dhcdbd-1.14-mod/Makefile	2006-08-02 18:02:42.000000000 +0200
+@@ -7,8 +7,8 @@
+ LDFLAGS ?= -g
+ DESTDIR ?= /
+ LIBDIR  ?= lib
+-DBUS_INCLUDES ?= -I/usr/$(LIBDIR)/dbus-1.0/include -I/usr/include/dbus-1.0
+-DBUS_LIBS     ?= -ldbus-1
++DBUS_INCLUDES ?= `pkg-config dbus-1 --cflags`
++DBUS_LIBS     ?= `pkg-config dbus-1 --libs`
+ OBJS   =  dbus_service.o dhcdbd.o dhcp_options.o main.o
+ SRCS   =  dbus_service.c dhcdbd.c dhcp_options.c main.c
+ INCS   =  dbus_service.h dhcdbd.h dhcp_options.h includes.h 
+diff -Naur dhcdbd-1.14/tests/Makefile dhcdbd-1.14-mod/tests/Makefile
+--- dhcdbd-1.14/tests/Makefile	2006-01-17 22:23:51.000000000 +0100
++++ dhcdbd-1.14-mod/tests/Makefile	2006-08-02 18:11:43.000000000 +0200
+@@ -2,7 +2,7 @@
+ LD        = ${CC}
+ CFLAGS    ?= -g -Wall
+ LDFLAGS   ?= -g
+-DBUS_LIBS ?= -ldbus-1
++DBUS_LIBS ?= `pkg-config dbus-1 --libs`
+ 
+ all:	test_dhcp_options test_dhcdbd_state test_subscriber test_subscriber_dbus test_prospective_subscriber
+ 
diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb
index a2db9f0686..1b3181fb95 100644
--- a/packages/e17/e17-gpe-menu-convert_0.2.bb
+++ b/packages/e17/e17-gpe-menu-convert_0.2.bb
@@ -4,7 +4,10 @@ RDEPENDS += "edje-utils e-wm"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-PR = "r3"
+PR = "r4"
+
+#this is a shell script
+PACKAGE_ARCH = "all"
 
 SRC_URI = "file://e17-gpe-menu-convert.sh"
 
diff --git a/packages/esmtp/esmtp-0.5.1/.mtn2git_empty b/packages/esmtp/esmtp-0.5.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/esmtp/esmtp-0.5.1/.mtn2git_empty
diff --git a/packages/esmtp/esmtp-0.5.1/configure.patch b/packages/esmtp/esmtp-0.5.1/configure.patch
new file mode 100644
index 0000000000..ef6244a935
--- /dev/null
+++ b/packages/esmtp/esmtp-0.5.1/configure.patch
@@ -0,0 +1,22 @@
+--- /orig-configure.ac	2005-02-15 18:43:40.000000000 +0200
++++ /configure.ac	2006-08-19 13:05:52.000000000 +0300
+@@ -29,16 +29,9 @@
+ 	LDFLAGS="$LDFLAGS -L$with_libesmtp/lib"
+ 	AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])])
+ fi    
+-AC_MSG_CHECKING(for libESMTP)
+-if libesmtp-config --version > /dev/null 2>&1
+-then
+-	AC_MSG_RESULT(yes)
+-	CFLAGS="$CFLAGS `libesmtp-config --cflags`"
+-	LIBS="$LIBS `libesmtp-config --libs`"
+-else
+-	AC_MSG_RESULT(no)
+-	AC_MSG_ERROR(libESMTP library not found)
+-fi
++
++  CFLAGS="$CFLAGS"
++  LIBS="$LIBS -lesmtp -lssl -lcrypto -ldl"
+ 
+ AC_SUBST( sysconfdir )
+ 
diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb
index 1b98a1291e..d980ea35ca 100644
--- a/packages/esound/esound-gpe_20020817.bb
+++ b/packages/esound/esound-gpe_20020817.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Enlightened Sound Daemon - GPE version"
 SECTION = "gpe/base"
 LICENSE = "GPL"
 DEPENDS = "audiofile"
-PR = "r4"
+PR = "r5"
 PROVIDES += "esound"
 RPROVIDES += "esound"
 
@@ -30,4 +30,4 @@ PACKAGES =+ "esddsp esd esd-utils"
 
 FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
 FILES_esd = "${bindir}/esd"
-FILES_esd-utils = "${bindir}"
+FILES_esd-utils = "${bindir}/*"
diff --git a/packages/gawk/gawk-native_3.1.4.bb b/packages/gawk/gawk-native_3.1.4.bb
index ba8efd1af7..0a33f71684 100644
--- a/packages/gawk/gawk-native_3.1.4.bb
+++ b/packages/gawk/gawk-native_3.1.4.bb
@@ -4,9 +4,7 @@ require gawk_${PV}.bb
 inherit native
 
 DEPENDS = ""
-PATCH_DEPENDS = ""
-PATCHCLEANCMD = ""
-PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
+PATCHTOOL = "patch"
 
 S = "${WORKDIR}/gawk-${PV}"
 
diff --git a/packages/glib-2.0/glib-2.0_2.12.0.bb b/packages/glib-2.0/glib-2.0_2.12.0.bb
index 2082e4ca6b..0dce9a6db7 100644
--- a/packages/glib-2.0/glib-2.0_2.12.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.0.bb
@@ -17,7 +17,7 @@ FILES_glib-2.0-utils = "${bindir}/*"
 
 EXTRA_OECONF = "--disable-debug"
 
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.12/glib-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gtk.org/pub/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"
 
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 3ce10b54de..ecf086815d 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -143,7 +143,7 @@ do_prep_locale_tree() {
 	for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
 		gunzip $i
 	done
-	cp -a ${STAGING_LIBDIR}/* $treedir/lib
+	cp -a ${D}/lib/* $treedir/lib
 	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
 		cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
 	fi
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 5d8df56280..5ee57d4430 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-DEFAULT_PREFERENCE = "-1"
 PR = "r10"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
@@ -16,7 +15,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 GLIBC_EXTRA_OECONF ?= ""
 
-GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN"
+GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
 
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
@@ -123,6 +122,7 @@ do_munge() {
 
 addtask munge before do_patch after do_unpack
 
+
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 9fb02f8211..5ab880d921 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
+DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 popt"
 DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
@@ -21,7 +21,8 @@ S = "${WORKDIR}/trunk"
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
+FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
+FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug"
 
 EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
 
diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb
index 719fe2395a..3a41ef731d 100644
--- a/packages/gnome/libbonoboui_2.10.0.bb
+++ b/packages/gnome/libbonoboui_2.10.0.bb
@@ -1,12 +1,13 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig
 
 FILES_${PN} += "${libdir}/libglade/2.0/*.so"
 FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
 	${libdir}/bonobo-2.0/samples"
+FILES_${PN}-dbg += "${libdir}/libglade/2.0/.debug/*.so"
 
 DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
 
diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb
index 36ee1aa67f..3c1b36ecd4 100644
--- a/packages/gnome/libgnomecanvas_2.10.2.bb
+++ b/packages/gnome/libgnomecanvas_2.10.2.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
@@ -9,6 +9,7 @@ DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so"
 
 do_stage() {
 	gnome_stage_includes
diff --git a/packages/gnome/libgnomecanvas_2.12.0.bb b/packages/gnome/libgnomecanvas_2.12.0.bb
index 36ee1aa67f..3c1b36ecd4 100644
--- a/packages/gnome/libgnomecanvas_2.12.0.bb
+++ b/packages/gnome/libgnomecanvas_2.12.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "A powerful object-oriented display"
 inherit gnome
 
@@ -9,6 +9,7 @@ DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl"
 EXTRA_OECONF = "--disable-gtk-doc"
 
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so"
 
 do_stage() {
 	gnome_stage_includes
diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb
index 86214904c8..53251ba84b 100644
--- a/packages/gnome/libgnomecups_0.2.2.bb
+++ b/packages/gnome/libgnomecups_0.2.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION="Gnome Cups Manager"
 LICENSE="GPLv2"
 PR="r0"
 
-DEPENDS="glib-2.0 gtk+ pango cups intltool"
+DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
 
 inherit gnome pkgconfig
 
diff --git a/packages/gobby/gobby_0.4.1.bb b/packages/gobby/gobby_0.4.1.bb
new file mode 100644
index 0000000000..8b7ccad199
--- /dev/null
+++ b/packages/gobby/gobby_0.4.1.bb
@@ -0,0 +1,8 @@
+LICENSE = "LGPL"
+HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
+
+DEPENDS = "net6 gtkmm obby gtksourceview libxml++"
+inherit autotools pkgconfig
+
+SRC_URI = "http://releases.0x539.de/gobby/gobby-${PV}.tar.gz"
diff --git a/packages/gobby/gtksourceview_1.7.2.bb b/packages/gobby/gtksourceview_1.7.2.bb
new file mode 100644
index 0000000000..084af175f7
--- /dev/null
+++ b/packages/gobby/gtksourceview_1.7.2.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
+
+DEPENDS = "gtk+ libgnomeprint"
+
+inherit gnome pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
diff --git a/packages/gobby/net6_1.2.2.bb b/packages/gobby/net6_1.2.2.bb
index daa7e9b5b9..f9154fcca9 100644
--- a/packages/gobby/net6_1.2.2.bb
+++ b/packages/gobby/net6_1.2.2.bb
@@ -7,4 +7,10 @@ inherit autotools pkgconfig
 
 SRC_URI = "http://releases.0x539.de/${PN}/${P}.tar.gz"
 
-
+do_stage() {
+    autotools_stage_all
+    install -d ${STAGING_LIBDIR}
+    install -d ${STAGING_INCDIR}/net6
+    install -m 644 inc/*.hpp ${STAGING_INCDIR}/net6
+    install -m 755 .libs/*so* ${STAGING_LIBDIR}/
+}
diff --git a/packages/gobby/net6_1.3.1.bb b/packages/gobby/net6_1.3.1.bb
new file mode 100644
index 0000000000..3bcf8811d9
--- /dev/null
+++ b/packages/gobby/net6_1.3.1.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+
+DEPENDS = "libsigc++-2.0 gnutls"
+inherit autotools pkgconfig
+
+SRC_URI = "http://releases.0x539.de/${PN}/${P}.tar.gz"
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/net6
+	install -m 644 inc/*.hpp ${STAGING_INCDIR}/net6
+	install -m 755 .libs/*so* ${STAGING_LIBDIR}/
+}
diff --git a/packages/gobby/obby_0.4.1.bb b/packages/gobby/obby_0.4.1.bb
new file mode 100644
index 0000000000..adf3a72571
--- /dev/null
+++ b/packages/gobby/obby_0.4.1.bb
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
+
+DEPENDS = "net6 gtkmm gmp"
+inherit autotools pkgconfig
+
+SRC_URI = "http://releases.0x539.de/obby/obby-${PV}.tar.gz"
+
+EXTRA_OECONF += " --with-libgmp-prefix=${STAGING_LIBDIR}"
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/obby
+	install -d ${STAGING_INCDIR}/obby/serialise
+	install -m 644 inc/*.hpp ${STAGING_INCDIR}/obby
+	install -m 644 inc/serialise/*.hpp ${STAGING_INCDIR}/obby/serialise
+	install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/
+}
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index 5f2ee4f122..326fae9257 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -1,5 +1,5 @@
 SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11"
+DEPENDS = "glib-2.0 dbus-glib hotplug-dbus virtual/libx11"
 RDEPENDS = "hotplug-dbus"
 LICENSE = "GPL"
 
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.12.bb b/packages/gpe-autostarter/gpe-autostarter_0.12.bb
new file mode 100644
index 0000000000..f92b5df16b
--- /dev/null
+++ b/packages/gpe-autostarter/gpe-autostarter_0.12.bb
@@ -0,0 +1,6 @@
+LICENSE = "GPL"
+SECTION = "gpe"
+DEPENDS = "glib-2.0 dbus-glib hotplug-dbus virtual/libx11"
+RDEPENDS = "hotplug-dbus"
+
+inherit gpe
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.6.bb b/packages/gpe-autostarter/gpe-autostarter_0.6.bb
index 0b3edf936f..ef7f255db6 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.6.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.6.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus"
+DEPENDS = "glib-2.0 dbus-glib hotplug-dbus"
 RDEPENDS = "hotplug-dbus"
 
 inherit gpe
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.7.bb b/packages/gpe-autostarter/gpe-autostarter_0.7.bb
index 5e6fe34c10..f92b5df16b 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.7.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.7.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus virtual/libx11"
+DEPENDS = "glib-2.0 dbus-glib hotplug-dbus virtual/libx11"
 RDEPENDS = "hotplug-dbus"
 
 inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb
index 232234a77f..d57cb53b83 100644
--- a/packages/gpe-beam/gpe-beam_0.2.6.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.6.bb
@@ -3,7 +3,7 @@ PR = "r1"
 inherit gpe
 
 DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus"
+DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb
index 48fdf116f1..4b54bef82d 100644
--- a/packages/gpe-beam/gpe-beam_0.2.7.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.7.bb
@@ -3,11 +3,11 @@ PR = "r1"
 inherit gpe
 
 DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus"
+DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
-SRC_URI += "file://decl.patch;patch=1;pnum=0"
-\ No newline at end of file
+SRC_URI += "file://decl.patch;patch=1;pnum=0"
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index 4047f6e7a9..b1a8f4f780 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -3,7 +3,7 @@ PR = "r0"
 inherit gpe
 
 DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus"
+DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "irda-utils"
 SECTION = "gpe"
 PRIORITY = "optional"
diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb
new file mode 100644
index 0000000000..6b8c4b9f55
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam_0.2.9.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GPE infrared communication applet"
+DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
+RDEPENDS = "irda-utils"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+LICENSE = "GPL"
+
+inherit gpe
+
diff --git a/packages/gpe-bluetooth/files/hciattach-bts.patch b/packages/gpe-bluetooth/files/hciattach-bts.patch
new file mode 100644
index 0000000000..aeff8b02b1
--- /dev/null
+++ b/packages/gpe-bluetooth/files/hciattach-bts.patch
@@ -0,0 +1,16 @@
+--- gpe-bluetooth-0.54/hciattach.sh.orig	2006-08-20 15:04:05.341384325 +0200
++++ gpe-bluetooth-0.54/hciattach.sh	2006-08-20 15:05:04.629179674 +0200
+@@ -2,8 +2,12 @@
+ 
+ if [ -f /etc/sysconfig/bluetooth ]; then
+   . /etc/sysconfig/bluetooth
++  if [ -f "$BLUETOOTH_SCRIPT" ]; then
++    BTS="-S $BLUETOOTH_SCRIPT"
++  fi
++
++  exec /sbin/hciattach -n $BLUETOOTH_PORT $BLUETOOTH_PROTOCOL $BLUETOOTH_SPEED $BTS
+ 
+-  exec /sbin/hciattach -n $BLUETOOTH_PORT $BLUETOOTH_PROTOCOL $BLUETOOTH_SPEED
+ else
+   echo "Bluetooth not configured"
+   exit 1
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
index 6186c70679..2b63d4a7e5 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
@@ -4,7 +4,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus libcontactsdb"
+DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus libcontactsdb"
 RDEPENDS = "bluez-utils-dbus blueprobe"
 
 GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
index 1089c08413..b7884c5374 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
@@ -5,7 +5,7 @@ PRIORITY    = "optional"
 MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r1"
 
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
 RDEPENDS = "bluez-utils-dbus blueprobe"
 
 GPE_TARBALL_SUFFIX= "bz2"
@@ -15,4 +15,4 @@ FILES_${PN} += '${datadir}/bluez-pin'
 
 do_configure () {
 	autotools_do_configure
-}
-\ No newline at end of file
+}
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
index ce28d0b347..1506bd4c8b 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb
@@ -5,7 +5,7 @@ PRIORITY    = "optional"
 MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
 RDEPENDS = "bluez-utils-dbus blueprobe"
 
 GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
index ce28d0b347..1506bd4c8b 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb
@@ -5,7 +5,7 @@ PRIORITY    = "optional"
 MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 PR          = "r0"
 
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
 RDEPENDS = "bluez-utils-dbus blueprobe"
 
 GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
index ce28d0b347..b02be325e6 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -3,12 +3,14 @@ DESCRIPTION = "GPE bluetooth support user interface tool."
 SECTION     = "gpe"
 PRIORITY    = "optional"
 MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
-PR          = "r0"
+PR          = "r1"
 
-DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus"
 RDEPENDS = "bluez-utils-dbus blueprobe"
 
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpe autotools
 
+SRC_URI += "file://hciattach-bts.patch;patch=1"
+
 FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-calendar/gpe-calendar_0.70.bb b/packages/gpe-calendar/gpe-calendar_0.70.bb
index eeab0a366c..d88c8c3930 100644
--- a/packages/gpe-calendar/gpe-calendar_0.70.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.70.bb
@@ -5,11 +5,11 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 inherit autotools gpe
 
-DEPENDS = "dbus libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
+DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
 DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
 
 do_configure () {
 	autotools_do_configure
-}
-\ No newline at end of file
+}
diff --git a/packages/gpe-calendar/gpe-calendar_0.71.bb b/packages/gpe-calendar/gpe-calendar_0.71.bb
index eeab0a366c..d88c8c3930 100644
--- a/packages/gpe-calendar/gpe-calendar_0.71.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.71.bb
@@ -5,11 +5,11 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 inherit autotools gpe
 
-DEPENDS = "dbus libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
+DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
 DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
 
 do_configure () {
 	autotools_do_configure
-}
-\ No newline at end of file
+}
diff --git a/packages/gpe-calendar/gpe-calendar_0.72.bb b/packages/gpe-calendar/gpe-calendar_0.72.bb
index c5d1435d8d..d88c8c3930 100644
--- a/packages/gpe-calendar/gpe-calendar_0.72.bb
+++ b/packages/gpe-calendar/gpe-calendar_0.72.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 
 inherit autotools gpe
 
-DEPENDS = "dbus libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
+DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
 DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
diff --git a/packages/gpe-contacts/gpe-contacts_0.45.bb b/packages/gpe-contacts/gpe-contacts_0.45.bb
index b5afbb3a3c..56c3af8eb2 100644
--- a/packages/gpe-contacts/gpe-contacts_0.45.bb
+++ b/packages/gpe-contacts/gpe-contacts_0.45.bb
@@ -3,7 +3,7 @@ inherit gpe autotools
 
 PR = "r0"
 
-DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
+DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
 DESCRIPTION = "GPE contacts manager"
diff --git a/packages/gpe-edit/gpe-edit_0.32.bb b/packages/gpe-edit/gpe-edit_0.32.bb
new file mode 100644
index 0000000000..e504ec2271
--- /dev/null
+++ b/packages/gpe-edit/gpe-edit_0.32.bb
@@ -0,0 +1,9 @@
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "gpe"
+DESCRIPTION = "Editor for the GPE Palmtop Environment"
+LICENSE = "GPL"
+PR = "r1"
+
+DEPENDS = "gtk+ libgpewidget"
+
+inherit gpe
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.23.bb b/packages/gpe-filemanager/gpe-filemanager_0.23.bb
index 2beee83596..5d0fe7a1b0 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.23.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.23.bb
@@ -4,7 +4,7 @@ inherit gpe
 PR          = "r0"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
-DEPENDS     = "libgpewidget gnome-vfs dbus"
+DEPENDS     = "libgpewidget gnome-vfs dbus-glib"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
 RRECOMMENDS = "gnome-vfs-plugin-file"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.24.bb b/packages/gpe-filemanager/gpe-filemanager_0.24.bb
index 2beee83596..5d0fe7a1b0 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.24.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.24.bb
@@ -4,7 +4,7 @@ inherit gpe
 PR          = "r0"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
-DEPENDS     = "libgpewidget gnome-vfs dbus"
+DEPENDS     = "libgpewidget gnome-vfs dbus-glib"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
 RRECOMMENDS = "gnome-vfs-plugin-file"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.25.bb b/packages/gpe-filemanager/gpe-filemanager_0.25.bb
index 898ff6002b..1ccb811490 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.25.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.25.bb
@@ -4,7 +4,7 @@ inherit gpe
 PR          = "r1"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
-DEPENDS     = "libgpewidget gnome-vfs dbus"
+DEPENDS     = "libgpewidget gnome-vfs dbus-glib"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.7.bb b/packages/gstreamer/gst-plugins-base_0.10.7.bb
index 48e24bf756..1679ecb1ca 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.7.bb
@@ -1,2 +1,7 @@
 require gst-plugins.inc
 PROVIDES_${PN} += "gst-plugins"
+
+do_stage() {
+       autotools_stage_all
+}
+
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
new file mode 100644
index 0000000000..7c548acf7d
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb
@@ -0,0 +1,2 @@
+require gst-plugins.inc
+DEPENDS += "gst-plugins-base"
diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb
new file mode 100644
index 0000000000..251eb42a5d
--- /dev/null
+++ b/packages/gstreamer/gstreamer_0.10.8.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.gstreamer.net/"
+MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
+DEPENDS = "libxml2 glib-2.0 gettext-native popt"
+
+PR = "r0"
+# until we have decided a final naming scheme, 
+# don't use this package as a replacement for
+# version 0.8
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
new file mode 100644
index 0000000000..2f7e21892a
--- /dev/null
+++ b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
@@ -0,0 +1,7 @@
+SECTION = "unknown"
+LICENSE = "GPL"
+inherit gnome
+
+SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz"
+
+FILES_${PN} += "${datadir}/icons"
diff --git a/packages/horizon/.mtn2git_empty b/packages/horizon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/horizon/.mtn2git_empty
diff --git a/packages/horizon/files/.mtn2git_empty b/packages/horizon/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/horizon/files/.mtn2git_empty
diff --git a/packages/horizon/files/makefile.patch b/packages/horizon/files/makefile.patch
new file mode 100644
index 0000000000..33f341ef08
--- /dev/null
+++ b/packages/horizon/files/makefile.patch
@@ -0,0 +1,34 @@
+--- /tmp/Makefile	2006-08-30 12:51:56.000000000 +0200
++++ horizon/src/Makefile	2006-08-30 12:53:03.025780000 +0200
+@@ -2,12 +2,11 @@
+ 
+ all: .depend $(BINARY)
+ 
+-CFLAGS  = -g -O2 -Wall -Werror                              \
+-	  -I/usr/X11R6/include                              \
++HCFLAGS  = -g -O2 -Wall -Werror                              \
+ 	  `sdl-config --cflags`                             \
+ 	  `pkg-config --cflags glib-2.0 gobject-2.0 libpng` \
+ 	  -I.
+-LDFLAGS = -L/usr/X11R6/lib -lX11                            \
++HLDFLAGS = -lX11                            \
+ 	  `sdl-config --libs`                               \
+ 	  `pkg-config --libs glib-2.0 gobject-2.0 libpng`   \
+ 	  -ljpeg
+@@ -16,7 +15,7 @@
+ OBJS   = $(CFILES:.c=.o)
+ 
+ $(BINARY): $(OBJS) 
+-	$(CC) *.o */*.o -o $@ $(LDFLAGS)
++	$(CC) *.o */*.o -o $@ $(LDFLAGS) $(HLDFLAGS)
+ 
+ clean:
+ 	rm -f $(OBJS) $(BINARY) *.o *~ */*~ */*/*~ .depend
+@@ -35,6 +34,6 @@
+ 	./$(BINARY) /tmp/horizon
+ 
+ .depend: *.[ch] */*.[ch]
+-	$(CC) -M $(CFLAGS) */*.c *.c > .depend
++	$(CC) -M $(CFLAGS) $(HCFLAGS) */*.c *.c > .depend
+ 
+ include .depend
diff --git a/packages/horizon/horizon_cvs.bb b/packages/horizon/horizon_cvs.bb
new file mode 100644
index 0000000000..d83fbf9868
--- /dev/null
+++ b/packages/horizon/horizon_cvs.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Horizon is a sketchbook application for tablet devices."
+LICENSE = "GPLv2"
+
+DEPENDS = "glib-2.0 libpng jpeg virtual/libsdl"
+
+SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=horizon \
+	file://makefile.patch;patch=1"
+
+inherit pkgconfig binconfig
+
+S = "${WORKDIR}/horizon"
+PV = "0.37+cvs${SRCDATE}"
+
+PARALLEL_MAKE = ""
+
+CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL -I. -Isrc -L${STAGING_LIBDIR} `PKG_CONFIG_PATH=${STAGING_DATADIR}/pkgconfig pkg-config --cflags glib-2.0 gobject-2.0 libpng`"
+
+do_compile() {
+	#yes, this is a hack to work around a faulty makefile
+	oe_runmake horizon 
+}	
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 755 horizon ${D}${bindir}
+}	
+
diff --git a/packages/imagemagick/.mtn2git_empty b/packages/imagemagick/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imagemagick/.mtn2git_empty
diff --git a/packages/imagemagick/files/.mtn2git_empty b/packages/imagemagick/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imagemagick/files/.mtn2git_empty
diff --git a/packages/imagemagick/files/PerlMagic_MakePatch b/packages/imagemagick/files/PerlMagic_MakePatch
new file mode 100644
index 0000000000..c87414529a
--- /dev/null
+++ b/packages/imagemagick/files/PerlMagic_MakePatch
@@ -0,0 +1,13 @@
+Index: ImageMagick-6.2.5/PerlMagick/Makefile.PL.in
+===================================================================
+--- ImageMagick-6.2.5.orig/PerlMagick/Makefile.PL.in	2005-04-21 00:27:36.000000000 +0800
++++ ImageMagick-6.2.5/PerlMagick/Makefile.PL.in	2005-10-04 04:43:35.239036400 +0800
+@@ -72,6 +72,8 @@
+ 
+    # Use same compiler as ImageMagick
+    'PERLMAINCC'	=> '@PERLMAINCC@',
++   'AR' => '@AR@',
++   'LD' => '@PERLMAINCC@',
+ 
+    # Set Perl installation prefix to ImageMagick installation prefix
+ #   'PREFIX'	=> '@prefix@',
diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb
new file mode 100644
index 0000000000..cac16329c4
--- /dev/null
+++ b/packages/imagemagick/imagemagick_6.2.9.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+SECTION = "console/utils"
+DEPENDS = "tiff"
+DESCRIPTION = "ImageMagick is an image convertion tools"
+
+SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \
+	   file://PerlMagic_MakePatch;patch=1"
+
+S = "${WORKDIR}/ImageMagick-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF="-without-x "
+
+LEAD_SONAME="libMagick.so.*"
+
+FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
+		${libdir}/ImageMagick-${PV}/config/ \
+		${datadir}/ImageMagick-${PV}"
+
+FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb
index 68cfac7490..04b1aa299d 100644
--- a/packages/images/bootstrap-image-bootchart.bb
+++ b/packages/images/bootstrap-image-bootchart.bb
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image-bootchart"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap bootchart acct"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct"
 
-DEPENDS = "task-bootstrap bootchart"
+DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart"
 RDEPENDS = "acct"
 
 inherit image_ipk
diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb
index 1791dd8f56..50c1a8f354 100644
--- a/packages/images/bootstrap-image.bb
+++ b/packages/images/bootstrap-image.bb
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 
 inherit image_ipk
 
diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb
index fa964b4490..b1c714c79e 100644
--- a/packages/images/dvb-image.bb
+++ b/packages/images/dvb-image.bb
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "dvb-image"
 
 IMAGE_LINGUAS = ""
 
-DVB_PACKAGES = "task-bootstrap task-dvb"
+DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb"
 
 export IPKG_INSTALL = "${DVB_PACKAGES}"
 DEPENDS = "${DVB_PACKAGES}"
diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb
index 9a1ed51a1a..f41f04ee23 100644
--- a/packages/images/e-image-core.bb
+++ b/packages/images/e-image-core.bb
@@ -5,7 +5,7 @@ PR = "r1"
 export IMAGE_BASENAME = "e-image-core"
 export IMAGE_LINGUAS = ""
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
            xserver-kdrive \
            task-e-x11-core"
 
@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
 PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 PREFERRED_PROVIDER_libx11 = "libx11"
 
-export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
 
 inherit image_ipk
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 92bed0dd5c..75aa14a0f4 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -24,11 +24,11 @@ GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb
index 2adc88b958..19157b6a5f 100644
--- a/packages/images/maemo-image.bb
+++ b/packages/images/maemo-image.bb
@@ -15,11 +15,11 @@ MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools"
 
 XSERVER ?= "xserver-kdrive-omap"
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
 	   meta-maemo \
 	   ${MAEMO_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \
 	               maemo-task-apps ${MAEMO_EXTRA_INSTALL} \
 		       ${XSERVER}"
 
diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb
index 7836258940..31992e4bc8 100644
--- a/packages/images/mythfront-image.bb
+++ b/packages/images/mythfront-image.bb
@@ -4,7 +4,7 @@ IMAGE_ROOTFS_SIZE_ext2 = "85000"
 IMAGE_ROOTFS_SIZE_ext2.gz = "85000"
 IMAGE_LINGUAS = ""
 
-MYTHFRONT_PACKAGES = "task-bootstrap task-mythfront"
+MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront"
 
 export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}"
 DEPENDS = "${MYTHFRONT_PACKAGES}"
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index c786f67e0b..b7c68ec505 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -6,12 +6,12 @@ FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${D
 LICENSE = "MIT"
 PR = "r21"
 
-DEPENDS = "task-bootstrap task-opie"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
 RDEPENDS = "${INSTALL_PACKAGES}"
 
 extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
-INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
+INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \
 		    task-opie-base-inputmethods task-opie-base-apps \
 		    task-opie-base-settings task-opie-base-decorations \
 		    task-opie-base-styles task-opie-base-pim \
diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb
index 0f3254b56e..79c8094f34 100644
--- a/packages/images/sdl-image.bb
+++ b/packages/images/sdl-image.bb
@@ -2,8 +2,8 @@ LICENSE = MIT
 
 export IMAGE_BASENAME = "sdl-image"
 
-DEPENDS = "task-bootstrap task-sdl"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl"
 
-export IPKG_INSTALL = "task-bootstrap sdl-base"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base"
 
 inherit image_ipk
diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb
index be7f28fb91..1ddd022d08 100644
--- a/packages/images/sectest-gpe-image.bb
+++ b/packages/images/sectest-gpe-image.bb
@@ -21,11 +21,11 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb
index 7015f7020c..f609dfd07e 100644
--- a/packages/images/twin-image.bb
+++ b/packages/images/twin-image.bb
@@ -1,13 +1,13 @@
 export IMAGE_BASENAME="twin-image"
 
-DEPENDS = 'task-bootstrap \
+DEPENDS = '${MACHINE_TASK_PROVIDER} \
           twin \
 	  orpheus \
 	  nano \
 	  vim \
 	  mutt'
 
-export IPKG_INSTALL = 'task-bootstrap \
+export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \
 		       twin \
 		       orpheus \
 		       nano \
diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb
index 6ebbf04537..5b6981488e 100644
--- a/packages/images/uml-image.bb
+++ b/packages/images/uml-image.bb
@@ -6,7 +6,7 @@ export IMAGE_BASENAME = "uml-image"
 OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2"
 OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 export IPKG_INSTALL = "${DEPENDS}"
 
 inherit image_ipk
diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb
index 5605a6b2ee..f861b9e6dd 100644
--- a/packages/images/xfce-image.bb
+++ b/packages/images/xfce-image.bb
@@ -5,7 +5,7 @@ IMAGE_LINGUAS = ""
 X_DEPENDS = "virtual/xserver"
 X_RDEPENDS = "xserver-kdrive-fbdev"
 
-XFCE_DEPENDS = "task-bootstrap task-xfce-base"
+XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base"
 XFCE_RDEPENDS = "${XFCE_DEPENDS}"
 
 export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}"
diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb
index 2b98ec98fc..d6cc7b1640 100644
--- a/packages/images/xterminal-image.bb
+++ b/packages/images/xterminal-image.bb
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "xterminal-image"
 
 IMAGE_LINGUAS = ""
 
-XTERMINAL_PACKAGES = "task-bootstrap task-xterminal"
+XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal"
 
 export IPKG_INSTALL = "${XTERMINAL_PACKAGES}"
 DEPENDS = "${XTERMINAL_PACKAGES}"
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index 8255038c32..0283e1acca 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -148,7 +148,12 @@ fi
 #	remount the rootfs rw but do not try to change mtab because it
 #	is on a ro fs until the remount succeeded. Then clean up old mtabs
 #	and finally write the new mtab.
+#	This part is only needed if the rootfs was mounted ro.
 #
+if [ $(grep rootfs /proc/mounts | awk '{print $4}') = rw ]; then
+	exit 0
+fi
+echo "Remounting root file system..."
 mount -n -o remount,$rootmode /
 if test "$rootmode" = rw
 then
diff --git a/packages/initscripts/initscripts-1.0/devices b/packages/initscripts/initscripts-1.0/devices
index 28fb71fe3f..fb0f851d16 100755
--- a/packages/initscripts/initscripts-1.0/devices
+++ b/packages/initscripts/initscripts-1.0/devices
@@ -6,7 +6,7 @@
 . /etc/default/rcS
 
 # exit without doing anything if udev is active
-if test -e /dev/.udevdb; then
+if test -e /dev/.udev -o -e /dev/.udevdb; then
 	exit 0
 fi
 
diff --git a/packages/initscripts/initscripts-1.0/slugos/devices.patch b/packages/initscripts/initscripts-1.0/slugos/devices.patch
index 26b1841d5b..2583b62f48 100644
--- a/packages/initscripts/initscripts-1.0/slugos/devices.patch
+++ b/packages/initscripts/initscripts-1.0/slugos/devices.patch
@@ -8,8 +8,8 @@
  . /etc/default/rcS
  
  # exit without doing anything if udev is active
--if test -e /dev/.udevdb; then
-+if test -e /dev/.udevdb -o -e /dev/.permanent; then
+-if test -e /dev/.udev -o -e /dev/.udevdb; then
++if test -e /dev/.udev -o -e /dev/.udevdb -o -e /dev/.permanent; then
  	exit 0
  fi
  
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 0d14403a36..29747d41c2 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r74"
+PR = "r75"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/ipsec-tools/ipsec-tools.inc b/packages/ipsec-tools/ipsec-tools.inc
index 2b1669f987..31ec6c87bf 100644
--- a/packages/ipsec-tools/ipsec-tools.inc
+++ b/packages/ipsec-tools/ipsec-tools.inc
@@ -3,7 +3,8 @@ Linux-2.6 IPsec implementation."
 DEPENDS = "virtual/kernel openssl readline flex"
 LICENSE = "BSD"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "console/net"
+SECTION = "console/network"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/libhal-nm/.mtn2git_empty b/packages/libhal-nm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libhal-nm/.mtn2git_empty
diff --git a/packages/libhal-nm/libhal-nm_0.0.2.bb b/packages/libhal-nm/libhal-nm_0.0.2.bb
new file mode 100644
index 0000000000..59c7d93217
--- /dev/null
+++ b/packages/libhal-nm/libhal-nm_0.0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A library emulating libhal on systems where HAL cannot run"
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.handhelds.org/~mmp"
+MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
+PRIORITY = "optional"
+DEPENDS = "glib-2.0"
+SRC_URI = "http://www.handhelds.org/~mmp/files/libhal-nm-${PV}.tar.gz"
+
+PR = "r1"
+
+inherit autotools
+
+do_stage () {
+	autotools_stage_all
+}
+
+do_install () {
+	oe_runmake DESTDIR=${D} install
+}
+
diff --git a/packages/libnl/.mtn2git_empty b/packages/libnl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libnl/.mtn2git_empty
diff --git a/packages/libnl/files/.mtn2git_empty b/packages/libnl/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libnl/files/.mtn2git_empty
diff --git a/packages/libnl/files/local-includes.patch b/packages/libnl/files/local-includes.patch
new file mode 100644
index 0000000000..5af463004b
--- /dev/null
+++ b/packages/libnl/files/local-includes.patch
@@ -0,0 +1,11 @@
+--- libnl-1.0-pre6/Makefile.opts.in.orig	2006-08-24 14:57:42.000000000 +0200
++++ libnl-1.0-pre6/Makefile.opts.in	2006-08-24 14:58:20.000000000 +0200
+@@ -10,7 +10,7 @@
+ #
+ 
+ CC               := @CC@
+-CFLAGS           := @CFLAGS@
++CFLAGS           := -I./include -I. -I../include @CFLAGS@
+ LDFLAGS          := @LDFLAGS@
+ CPPFLAGS         := @CPPFLAGS@
+ PACKAGE_NAME     := @PACKAGE_NAME@
diff --git a/packages/libnl/libnl_1.0-pre6.bb b/packages/libnl/libnl_1.0-pre6.bb
new file mode 100644
index 0000000000..beac3f732e
--- /dev/null
+++ b/packages/libnl/libnl_1.0-pre6.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
+MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
+PRIORITY = "optional"
+PV = "0.99+1.0-pre6"
+
+inherit autotools pkgconfig gpe
+
+SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre6.tar.gz \
+           file://local-includes.patch;patch=1"
+
+S = "${WORKDIR}/${PN}-1.0-pre6"
+
+do_stage () {
+	autotools_stage_all prefix=${prefix}
+}
+
diff --git a/packages/libnss-mdns/libnss-mdns_0.6.bb b/packages/libnss-mdns/libnss-mdns_0.6.bb
index fc1941fc23..5de9df567c 100644
--- a/packages/libnss-mdns/libnss-mdns_0.6.bb
+++ b/packages/libnss-mdns/libnss-mdns_0.6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs"
 PRIORITY = "optional"
 
-RRECOMMENDS_${PN} = "avahi-daemon zeroconf"
+RRECOMMENDS_${PN} = "zeroconf"
 PR = "r1"
 
 EXTRA_OECONF = "--libdir=/lib"
diff --git a/packages/libnss-mdns/libnss-mdns_0.7.bb b/packages/libnss-mdns/libnss-mdns_0.7.bb
index 306adb0ee6..98ab50f07f 100644
--- a/packages/libnss-mdns/libnss-mdns_0.7.bb
+++ b/packages/libnss-mdns/libnss-mdns_0.7.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs"
 PRIORITY = "optional"
 
-RRECOMMENDS_${PN} = "avahi-daemon zeroconf"
+RRECOMMENDS_${PN} = "zeroconf"
 PR = "r0"
 
 EXTRA_OECONF = "--libdir=/lib"
diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb
index 997daf43b0..475297cd63 100644
--- a/packages/libnss-mdns/libnss-mdns_0.8.bb
+++ b/packages/libnss-mdns/libnss-mdns_0.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs"
 PRIORITY = "optional"
 
-RRECOMMENDS_${PN} = "avahi-daemon zeroconf"
+RRECOMMENDS_${PN} = "zeroconf"
 PR = "r0"
 
 EXTRA_OECONF = "--libdir=/lib"
diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb
index 480a888745..8ceec7e62a 100644
--- a/packages/libvncserver/libvncserver_0.8.2.bb
+++ b/packages/libvncserver/libvncserver_0.8.2.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Patrik Gfeller <gfellerpatrik@gmx.net>"
 SECTION = "libs"
 PRIORITY = "optional"
 PROVIDES = "x11vnc"
-DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg"
+DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg libxext"
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz;md5sum=17a18e398af6c1730f72068022a152aa"
diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index fd9baee512..d0f58303fa 100644
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -3,7 +3,7 @@ This version is configured for the usage with framebuffer based environments"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg tremor libmad libmodplug"
+DEPENDS = "zlib libogg tremor libmad libmodplug libpng"
 PROVIDES = "virtual/libxine"
 PR = "r1"
 
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index dfce1d32ec..692c55cf9f 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng"
 PROVIDES = "virtual/libxine"
 PR = "r0"
 
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index 8f172f23a7..b4ab063063 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng"
 PROVIDES = "virtual/libxine"
 PR = "r0"
 
diff --git a/packages/libxml/libxml++_2.14.0.bb b/packages/libxml/libxml++_2.14.0.bb
new file mode 100644
index 0000000000..6eb296c8c2
--- /dev/null
+++ b/packages/libxml/libxml++_2.14.0.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
+
+DEPENDS = "gtk+"
+
+inherit gnome pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
diff --git a/packages/links/files/cookies-save-0.96.patch b/packages/links/files/cookies-save-0.96.patch
new file mode 100644
index 0000000000..a1e35c01ca
--- /dev/null
+++ b/packages/links/files/cookies-save-0.96.patch
@@ -0,0 +1,106 @@
+diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c
+--- links-0.96/cookies.c	Mon Sep  3 07:19:37 2001
++++ links-0.96+cookies-save/cookies.c	Mon Sep  3 07:18:42 2001
+@@ -276,15 +276,99 @@
+ 
+ void init_cookies(void)
+ {
+-	/* !!! FIXME: read cookies */
++	unsigned char in_buffer[MAX_STR_LEN];
++	unsigned char *cookfile, *p, *q;
++	FILE *fp;
++
++	/* must be called after init_home */
++	if (! links_home) return;
++	
++	cookfile = stracpy(links_home);
++	if (! cookfile) return;
++	add_to_strn(&cookfile, "cookies");
++
++	fp = fopen(cookfile, "r");
++	mem_free(cookfile);
++	if (fp == NULL) return;
++	
++	while (fgets(in_buffer, MAX_STR_LEN, fp)) {
++		struct cookie *cookie;
++		
++		if (!(cookie = mem_alloc(sizeof(struct cookie)))) return;
++		memset(cookie, 0, sizeof(struct cookie));
++		
++		q = in_buffer; p = strchr(in_buffer, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->name = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->value = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->server = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->path = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->domain = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->expires = atoi(q);
++		
++		cookie->secure = atoi(p);
++		
++		cookie->id = cookie_id++;
++
++		accept_cookie(cookie);
++
++		continue;
++
++inv:
++		free_cookie(cookie);
++		free(cookie);
++	}
++	fclose(fp);
+ }
+ 
+ void cleanup_cookies(void)
+ {
+ 	struct cookie *c;
++	unsigned char *cookfile;
++	FILE *fp;
++	
+ 	free_list(c_domains);
+-	/* !!! FIXME: save cookies */
+-	foreach (c, cookies) free_cookie(c);
++
++	cookfile = stracpy(links_home);
++	if (! cookfile) return;
++	add_to_strn(&cookfile, "cookies");
++
++	fp = fopen(cookfile, "w");
++	mem_free(cookfile);
++	if (fp == NULL) return;
++	
++	foreach (c, cookies) {
++		if (c->expires && ! cookie_expired(c))
++			fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
++			    c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
++			    c->domain?c->domain:(unsigned char *)"", c->expires, c->secure);
++
++		free_cookie(c);
++	}
++
++	fclose(fp);
++	
+ 	free_list(cookies);
+ }
+ 
diff --git a/packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch b/packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
new file mode 100644
index 0000000000..0d3b407e2a
--- /dev/null
+++ b/packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
@@ -0,0 +1,20 @@
+--- links-2.1pre17/cookies.c.pix	2005-05-15 23:05:10.000000000 +0800
++++ links-2.1pre17/cookies.c	2005-05-15 23:17:21.000000000 +0800
+@@ -41,7 +41,7 @@
+ 
+ void free_cookie(struct cookie *c)
+ {
+-	mem_free(c->name);
++	if (c->value) mem_free(c->name);
+ 	if (c->value) mem_free(c->value);
+ 	if (c->server) mem_free(c->server);
+ 	if (c->path) mem_free(c->path);
+@@ -355,7 +355,7 @@
+ 
+ inv:
+ 		free_cookie(cookie);
+-		free(cookie);
++		mem_free(cookie);
+ 	}
+ 	fclose(fp);
+ }
diff --git a/packages/links/links-2.1pre12/configure.patch b/packages/links/links-2.1pre12/configure.patch
deleted file mode 100644
index 0425843f60..0000000000
--- a/packages/links/links-2.1pre12/configure.patch
+++ /dev/null
@@ -1,21443 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- links-2.1pre12/configure.in~configure
-+++ links-2.1pre12/configure.in
-@@ -3,7 +3,8 @@
- #          Martin 'PerM' Pergel
- # This file is a part of the Links program, released under GPL.
- 
--AC_INIT(main.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([main.c])
- 
- AM_INIT_AUTOMAKE(links, 2.1pre12)
- 
-@@ -13,12 +14,12 @@
- AUTOHEADER="./missing autoheader"
- image_formats="GIF PNG XBM"
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- dnl Checks for programs.
- AC_PROG_CC
- 
--#AC_PROG_CXX
-+AC_PROG_CXX
- #AC_PROG_AWK
- #AM_PROG_LEX
- #AC_PROG_YACC
-@@ -27,20 +28,20 @@
- #AC_CHECK_LIB(fl,main,AC_DEFINE(JS) LIBS="$LIBS -lfl",AC_MSG_WARN(You don't have libfl; you won't be able to run javascript))
- 
- AC_CACHE_CHECK([for EMX], ac_cv_have_emx,
--	AC_TRY_COMPILE(, [#ifndef __EMX__
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#ifndef __EMX__
- 	kill me!
--	#endif ], ac_cv_have_emx=yes, ac_cv_have_emx=no)
-+	#endif ]])],[ac_cv_have_emx=yes],[ac_cv_have_emx=no])
- )
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g" | sed "s/-Zbin-files//g"`
- 
- AC_CACHE_CHECK([for typeof], ac_cv_have_typeof,
--	AC_TRY_COMPILE(, [int a;
--	typeof(a) b;], ac_cv_have_typeof=yes, ac_cv_have_typeof=no)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a;
-+	typeof(a) b;]])],[ac_cv_have_typeof=yes],[ac_cv_have_typeof=no])
- 	)
- test "$ac_cv_have_typeof" = yes && AC_DEFINE(HAVE_TYPEOF)
- 
- AC_CACHE_CHECK([for long long], ac_cv_have_long_long,
--	AC_TRY_COMPILE(, [unsigned long long a; ], ac_cv_have_long_long=yes, ac_cv_have_long_long=no)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[unsigned long long a; ]])],[ac_cv_have_long_long=yes],[ac_cv_have_long_long=no])
- )
- test "$ac_cv_have_long_long" = yes && AC_DEFINE(HAVE_LONG_LONG)
- 
-@@ -87,7 +88,7 @@
- AC_CHECK_SIZEOF(long, "$default_int")
- AC_CHECK_SIZEOF(unsigned long, "$default_int")
- AC_CACHE_CHECK([for big endian], ac_cv_big_endian,
--	AC_TRY_RUN([
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	long l;
- 	char *c = (char *)&l;
- 	int main()
-@@ -95,10 +96,10 @@
- 		l = 0x12345678L;
- 		return !(c[[sizeof(long) - 1]] == 0x78 && c[[sizeof(long) - 2]] == 0x56 && c[[sizeof(long) - 3]] == 0x34 && c[[sizeof(long) - 4]] == 0x12);
- 	}
--	], ac_cv_big_endian=yes, ac_cv_big_endian=no, ac_cv_big_endian=no)
-+	]])],[ac_cv_big_endian=yes],[ac_cv_big_endian=no],[ac_cv_big_endian=no])
- )
- AC_CACHE_CHECK([for little endian], ac_cv_little_endian,
--	AC_TRY_RUN([
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	long l;
- 	char *c = (char *)&l;
- 	int main()
-@@ -106,9 +107,12 @@
- 		l = 0x12345678L;
- 		return !(c[[0]] == 0x78 && c[[1]] == 0x56 && c[[2]] == 0x34 && c[[3]] == 0x12);
- 	}
--	], ac_cv_little_endian=yes, ac_cv_little_endian=no, ac_cv_little_endian="$ac_cv_have_emx")
-+	]])],[ac_cv_little_endian=yes],[ac_cv_little_endian=no],[ac_cv_little_endian="$ac_cv_have_emx"])
- )
- 
-+AC_DEFUN([AC_BIG_ENDIAN],[],[])
-+AC_DEFUN([AC_LITTLE_ENDIAN],[],[])
-+
- if test "$ac_cv_big_endian" = yes; then
- 	AC_DEFINE(AC_BIG_ENDIAN)
- else if test "$ac_cv_little_endian" = yes; then
-@@ -122,19 +126,19 @@
- AC_TYPE_SIGNAL
- AC_FUNC_STRFTIME
- AC_FUNC_VPRINTF
--AC_HAVE_FUNCS(calloc)
--AC_HAVE_FUNCS(snprintf)
--AC_HAVE_FUNCS(gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod)
--AC_HAVE_FUNCS(getpid setpgid getpgid setpgrp getpgrp)
--AC_HAVE_FUNCS(popen)
--AC_HAVE_FUNCS(uname)
--AC_HAVE_FUNCS(strptime)
--AC_HAVE_FUNCS(setlocale)
--AC_HAVE_FUNCS(nl_langinfo)
--dnl AC_HAVE_FUNCS(sigsetjmp siglongjmp)
-+AC_CHECK_FUNCS([calloc])
-+AC_CHECK_FUNCS([snprintf])
-+AC_CHECK_FUNCS([gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod])
-+AC_CHECK_FUNCS([getpid setpgid getpgid setpgrp getpgrp])
-+AC_CHECK_FUNCS([popen])
-+AC_CHECK_FUNCS([uname])
-+AC_CHECK_FUNCS([strptime])
-+AC_CHECK_FUNCS([setlocale])
-+AC_CHECK_FUNCS([nl_langinfo])
-+dnl AC_CHECK_FUNCS([sigsetjmp siglongjmp])
- 
- AC_CACHE_CHECK([for sigsetjmp/siglongjmp], ac_cv_have_sigsetjmp,
--	AC_TRY_LINK([#include <setjmp.h>], [sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);], ac_cv_have_sigsetjmp=yes, ac_cv_have_sigsetjmp=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]], [[sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);]])],[ac_cv_have_sigsetjmp=yes],[ac_cv_have_sigsetjmp=no])
- )
- if test "$ac_cv_have_sigsetjmp" = yes; then
- 	AC_DEFINE(HAVE_SIGSETJMP)
-@@ -153,7 +157,7 @@
- fi
- 
- #AC_MSG_CHECKING([for gethostbyname])
--#AC_TRY_LINK([#include <netdb.h>], [gethostbyname("")], cf_result=yes, cf_result=no)
-+#AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[gethostbyname("")]])],[cf_result=yes],[cf_result=no])
- #AC_MSG_RESULT($cf_result)
- AC_CHECK_FUNC(gethostbyname, cf_result=yes, cf_result=no)
- if test "$cf_result" = no; then
-@@ -168,7 +172,7 @@
- AC_CHECK_FUNC(herror, AC_DEFINE(HAVE_HERROR))
- AC_CHECK_FUNC(cfmakeraw, AC_DEFINE(HAVE_CFMAKERAW))
- 
--AC_HAVE_FUNCS(cygwin_conv_to_full_win32_path)
-+AC_CHECK_FUNCS([cygwin_conv_to_full_win32_path])
- 
- AC_MSG_CHECKING([if you want to enable javascript])
- AC_ARG_ENABLE(javascript, [  --enable-javascript     use javascript interpreter], cf_use_javascript=yes, cf_use_javascript=no)
-@@ -192,7 +196,7 @@
- AC_CACHE_CHECK([for OS/2 threads], ac_cv_have_beginthread,
- 	CFLAGS_X="$CFLAGS"
- 	CFLAGS="$CFLAGS -Zmt"
--	AC_TRY_LINK([#include <stdlib.h>], [_beginthread(NULL, NULL, 0, NULL)], ac_cv_have_beginthread=yes, ac_cv_have_beginthread=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]], [[_beginthread(NULL, NULL, 0, NULL)]])],[ac_cv_have_beginthread=yes],[ac_cv_have_beginthread=no])
- 	CFLAGS="$CFLAGS_X"
- )
- if test "$ac_cv_have_beginthread" = yes; then
-@@ -209,8 +213,8 @@
- fi
- #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE))
- AC_CHECK_HEADERS(atheos/threads.h)
--AC_HAVE_FUNCS(spawn_thread)
--AC_HAVE_FUNCS(resume_thread)
-+AC_CHECK_FUNCS([spawn_thread])
-+AC_CHECK_FUNCS([resume_thread])
- 
- AC_CHECK_FUNC(MouOpen, AC_DEFINE(HAVE_MOUOPEN))
- AC_CHECK_FUNC(_read_kbd, AC_DEFINE(HAVE_READ_KBD))
-@@ -222,10 +226,10 @@
- 	if test -n "$X11ROOT"; then
- 		CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include"
- 		LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc"
--		AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86_gcc, ac_cv_have_x2=no)
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86_gcc],[ac_cv_have_x2=no])
- 		if test "$ac_cv_have_x2" = no; then
- 			LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86"
--			AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86, ac_cv_have_x2=no)
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86],[ac_cv_have_x2=no])
- 		fi
- 	fi
- 	CPPFLAGS="$CPPFLAGS_X"
-@@ -254,9 +258,9 @@
- 			else
- 				LIBS="-lssl -lcrypto $LIBS_X"
- 			fi
--			AC_TRY_LINK([#include <openssl/ssl.h>], [OpenSSL_add_all_algorithms()], cf_result=yes, cf_result=no)
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[OpenSSL_add_all_algorithms()]])],[cf_result=yes],[cf_result=no])
- 			if test "$cf_result" != yes; then
--				AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=yes, cf_result=no)
-+				AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
- 			fi
- 		fi
- 	done
-@@ -287,14 +291,14 @@
- 	AC_CHECK_HEADERS(png.h libpng/png.h)
- 	AC_CHECK_LIB(png, png_create_info_struct)
- 	if test "$ac_cv_header_png_h" != yes && test "$ac_cv_header_libpng_png_h" != yes || test "$ac_cv_lib_png_png_create_info_struct" != yes; then
--		AC_ERROR([You need libpng to compile Links in graphics mode])
-+		AC_MSG_ERROR([You need libpng to compile Links in graphics mode])
- 	fi
- 
--	AC_HAVE_FUNCS(png_set_rgb_to_gray)
-+	AC_CHECK_FUNCS([png_set_rgb_to_gray])
- 
- 	AC_CACHE_CHECK(if you can include both setjmp.h and png.h, ac_cv_include_setjmp_png,
--		AC_TRY_COMPILE([#include <setjmp.h>
--		#include <png.h>], [jmp_buf bla;], ac_cv_include_setjmp_png=yes, ac_cv_include_setjmp_png=no)
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>
-+		#include <png.h>]], [[jmp_buf bla;]])],[ac_cv_include_setjmp_png=yes],[ac_cv_include_setjmp_png=no])
- 	)
- 
- 	if test "$ac_cv_include_setjmp_png" != yes; then
-@@ -338,7 +342,7 @@
- 	AC_CACHE_CHECK([for svgalib], ac_cv_have_svgalib,
- 		LIBS_X="$LIBS"
- 		LIBS="$LIBS -lvga"
--		AC_TRY_LINK([#include <vga.h>], [vga_setmode(0)], ac_cv_have_svgalib=yes, ac_cv_have_svgalib=no)
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <vga.h>]], [[vga_setmode(0)]])],[ac_cv_have_svgalib=yes],[ac_cv_have_svgalib=no])
- 		LIBS="$LIBS_X"
- 	)
- 
-@@ -351,9 +355,9 @@
- 
- dnl		braine, tohle jsem predelal
- dnl 	AC_CACHE_CHECK([for framebuffer], ac_cv_have_fb,
--dnl 		AC_TRY_RUN([#include <stdio.h>
-+dnl 		AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- dnl 		#include <fcntl.h>
--dnl 		main(){return open("/dev/fb",O_RDWR)==-1;}], ac_cv_have_fb=yes, ac_cv_have_fb=no, ac_cv_have_fb=no)
-+dnl 		main(){return open("/dev/fb",O_RDWR)==-1;}]])],[ac_cv_have_fb=yes],[ac_cv_have_fb=no],[ac_cv_have_fb=no])
- dnl 	)
- 	
- if test "$disable_fb" != yes ; then
-@@ -406,14 +410,12 @@
- 
- if test "$disable_pmshell" != yes ; then
- 	AC_CACHE_CHECK([for pmshell], ac_cv_have_pmshell,
--		AC_TRY_LINK([#define INCL_WIN
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define INCL_WIN
- 			#define INCL_GPI
- 			#include <os2.h>
--			#include <sys/fmutex.h>],
--			[_fmutex mutex;
-+			#include <sys/fmutex.h>]], [[_fmutex mutex;
- 			WinDrawText(NULLHANDLE, -1, NULL, NULL, 0, 0, 0),
--			GpiSetPel(NULLHANDLE, NULL)],
--		ac_cv_have_pmshell=yes, ac_cv_have_pmshell=no)
-+			GpiSetPel(NULLHANDLE, NULL)]])],[ac_cv_have_pmshell=yes],[ac_cv_have_pmshell=no])
- 	)
- 			
- 	if test "$ac_cv_have_pmshell" = yes; then
-@@ -463,7 +465,8 @@
- test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe"
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
- 
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- echo "---------------------------------------------------------"
- echo "Configuration results:"
-@@ -485,5 +488,5 @@
- #rm Makefile.tmp
- 
- #if test -z "$AWK"; then
--#	AC_WARN([awk not found. You won't be able to rebuild code page table.]);
-+#	AC_MSG_WARN([awk not found. You won't be able to rebuild code page table.]);
- #fi
---- links-2.1pre12/configure~configure
-+++ links-2.1pre12/configure
-@@ -1,52 +1,324 @@
- #! /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.57.
- #
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
- 
--# Defaults:
--ac_help=
-+# 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
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/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 -n "`(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
-+  as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" 	$as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+# 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
--  --enable-javascript     use javascript interpreter"
--ac_help="$ac_help
--  --with-libfl            use libfl"
--ac_help="$ac_help
--  --enable-graphics       use graphics"
--ac_help="$ac_help
--  --with-ssl(=directory)  enable SSL support"
--ac_help="$ac_help
--  --without-libjpeg	  compile without JPEG support"
--ac_help="$ac_help
--  --without-libtiff       compile without TIFF support"
--ac_help="$ac_help
--  --without-svgalib       compile without svgalib graphics driver"
--ac_help="$ac_help
--  --without-x             compile without X Window System graphics driver"
--ac_help="$ac_help
--  --without-fb            compile without Linux Framebuffer graphics driver"
--ac_help="$ac_help
--  --without-directfb      compile without DirectFB graphics driver"
--ac_help="$ac_help
--  --without-pmshell       compile without PMShell graphics driver"
--ac_help="$ac_help
--  --without-atheos        compile without Atheos graphics driver"
--ac_help="$ac_help
--  --with-x                use the X Window System"
-+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="main.c"
-+# 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 CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP LIBOBJS DIRECTFB_CONFIG ATHEOS_GR_TRUE ATHEOS_GR_FALSE 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
-@@ -55,10 +327,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'
-@@ -72,17 +349,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"
-@@ -90,59 +359,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- \
-@@ -151,95 +420,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 \
-@@ -248,19 +469,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 \
-@@ -274,26 +495,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 \
-@@ -310,7 +531,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)
-@@ -320,7 +541,7 @@
-     ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-   | --sbi=* | --sb=*)
--    sbindir="$ac_optarg" ;;
-+    sbindir=$ac_optarg ;;
- 
-   -sharedstatedir | --sharedstatedir | --sharedstatedi \
-   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-@@ -331,58 +552,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.
-@@ -393,99 +613,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
- 
--# 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
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+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=main.c
- 
- # 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=..
-@@ -495,13 +726,464 @@
- 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]
-+  --disable-dependency-tracking Speeds up one-time builds
-+  --enable-dependency-tracking  Do not reject slow dependency extractors
-+  --enable-javascript     use javascript interpreter
-+  --enable-graphics       use graphics
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-libfl            use libfl
-+  --with-ssl(=directory)  enable SSL support
-+  --without-libjpeg	  compile without JPEG support
-+  --without-libtiff       compile without TIFF support
-+  --without-svgalib       compile without svgalib graphics driver
-+  --without-x             compile without X Window System graphics driver
-+  --without-fb            compile without Linux Framebuffer graphics driver
-+  --without-directfb      compile without DirectFB graphics driver
-+  --without-pmshell       compile without PMShell graphics driver
-+  --without-atheos        compile without Atheos graphics driver
-+  --with-x                use the X Window System
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-+              headers in a nonstandard directory <include dir>
-+  CXX         C++ compiler command
-+  CXXFLAGS    C++ compiler flags
-+  CPP         C preprocessor
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  ac_popdir=`pwd`
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d $ac_dir || continue
-+    ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
-+    cd $ac_dir
-+    # Check for guested configure; otherwise get Cygnus style configure.
-+    if test -f $ac_srcdir/configure.gnu; then
-+      echo
-+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-+    elif test -f $ac_srcdir/configure; then
-+      echo
-+      $SHELL $ac_srcdir/configure  --help=recursive
-+    elif test -f $ac_srcdir/configure.ac ||
-+           test -f $ac_srcdir/configure.in; then
-+      echo
-+      $ac_configure --help
-+    else
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi
-+    cd $ac_popdir
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit 0
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit 0
-+fi
-+exec 5>config.log
-+cat >&5 <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.57.  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.* *.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
-@@ -512,42 +1194,108 @@
- 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_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_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
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+am__api_version="1.7"
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
-@@ -558,14 +1306,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; }
-+  { { 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=$ac_aux_dir/config.guess
--ac_config_sub=$ac_aux_dir/config.sub
--ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
-@@ -574,231 +1328,371 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:583: 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
--	  if test $ac_prog = install &&
--            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
--	    # AIX install.  It has an incompatible calling convention.
--	    :
--	  else
--	    ac_cv_path_install="$ac_dir/$ac_prog -c"
--	    break 2
--	  fi
--	fi
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+  ./ | .// | /cC/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+          if test $ac_prog = install &&
-+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+            # AIX install.  It has an incompatible calling convention.
-+            :
-+          elif test $ac_prog = install &&
-+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+            # program-specific install script used by HP pwplus--don't use.
-+            :
-+          else
-+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+            break 3
-+          fi
-+        fi
-       done
--      ;;
--    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:636: 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
-+echo timestamp > conftest.file
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-    if test "$*" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
-+      set X `ls -t $srcdir/configure conftest.file`
-    fi
--   if test "$*" != "X $srcdir/configure conftestfile" \
--      && test "$*" != "X conftestfile $srcdir/configure"; then
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
- 
-       # If neither matched, then we have a broken ls.  This can happen
-       # 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
-+   test "$2" = conftest.file
-    )
- then
-    # Ok.
-    :
- else
--   { echo "configure: error: newly created file is older than distributed files!
--Check your system clock" 1>&2; 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
-+   { { 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
-+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"
-+  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
- 
--# 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:693: 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
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
- else
--  cat > conftestmake <<\EOF
-+  am_missing_run=
-+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+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_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  test -n "$AWK" && break
-+done
-+
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.make <<\_ACEOF
- 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
- 
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
- 
--PACKAGE=links
--
--VERSION=2.1pre12
-+ # test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
--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; }
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
- fi
--cat >> confdefs.h <<EOF
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=links
-+ VERSION=2.1pre12
-+
-+
-+cat >>confdefs.h <<_ACEOF
- #define PACKAGE "$PACKAGE"
--EOF
-+_ACEOF
- 
--cat >> confdefs.h <<EOF
-+
-+cat >>confdefs.h <<_ACEOF
- #define VERSION "$VERSION"
--EOF
-+_ACEOF
- 
-+# Some tools Automake needs.
- 
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
- 
--missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:739: checking for working aclocal" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$ac_t""found" 1>&6
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; 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_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
--   echo "$ac_t""missing" 1>&6
--fi
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
- 
--echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:752: checking for working autoconf" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
--   echo "$ac_t""found" 1>&6
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
- else
--   AUTOCONF="$missing_dir/missing autoconf"
--   echo "$ac_t""missing" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:765: checking for working automake" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$ac_t""found" 1>&6
--else
--   AUTOMAKE="$missing_dir/missing automake"
--   echo "$ac_t""missing" 1>&6
- fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; 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_STRIP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
- 
--echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:778: checking for working autoheader" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
--   echo "$ac_t""found" 1>&6
-+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
- else
--   AUTOHEADER="$missing_dir/missing autoheader"
--   echo "$ac_t""missing" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:791: checking for working makeinfo" >&5
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
--   MAKEINFO=makeinfo
--   echo "$ac_t""found" 1>&6
-+  STRIP=$ac_ct_STRIP
- else
--   MAKEINFO="$missing_dir/missing makeinfo"
--   echo "$ac_t""missing" 1>&6
-+  STRIP="$ac_cv_prog_STRIP"
- fi
- 
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+
-+
- 
- 
- ACLOCAL="./missing aclocal"
-@@ -807,218 +1701,646 @@
- AUTOHEADER="./missing autoheader"
- image_formats="GIF PNG XBM"
- 
-+          ac_config_headers="$ac_config_headers config.h"
- 
- 
-+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
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
- 
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
- 
--# Extract the first word of "gcc", so it can be a program name with args.
-+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:818: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+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_ac_ct_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  CC=$ac_ct_CC
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  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}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"
-+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
-+
-+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:848: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+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_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_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
-+    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:899: 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:931: 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 942 "configure"
--#include "confdefs.h"
- 
--main(){return(0);}
--EOF
--if { (eval echo configure:947: \"$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
-+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
-+#line $LINENO "configure"
-+/* 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" >&5
-+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-+  (eval $ac_link_default) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # Find the output, starting from the most likely.  This scheme is
-+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+# resort.
-+
-+# Be careful to initialize this variable, since it used to be cached.
-+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-+ac_cv_exeext=
-+# 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 "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { 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
--    ac_cv_prog_cc_cross=yes
-+    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
--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:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- 
--echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
--if test $ac_cv_prog_cc_works = no; then
--  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+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
-+  { { 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
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:973: 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 $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:978: 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 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.c <<EOF
--#ifdef __GNUC__
--  yes;
--#endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
--  ac_cv_prog_gcc=yes
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { 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
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
- 
--if test $ac_cv_prog_gcc = yes; then
--  GCC=yes
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_compiler_gnu=yes
- else
--  GCC=
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
--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:1006: 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
-+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
--  echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$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"
-@@ -1032,356 +2354,1564 @@
-     CFLAGS=
-   fi
- fi
-+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
-+#line $LINENO "configure"
-+/* 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;
-+}
-+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
-+  CC="$ac_save_CC $ac_arg"
-+  rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+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>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  for ac_declaration in \
-+   ''\
-+   '#include <stdlib.h>' \
-+   'extern "C" void std::exit (int) throw (); using std::exit;' \
-+   'extern "C" void std::exit (int); using std::exit;' \
-+   'extern "C" void exit (int) throw ();' \
-+   'extern "C" void exit (int);' \
-+   'void exit (int);'
-+do
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.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>&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.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+  echo '#ifdef __cplusplus' >>confdefs.h
-+  echo $ac_declaration      >>confdefs.h
-+  echo '#endif'             >>confdefs.h
-+fi
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+DEPDIR="${am__leading_dot}deps"
-+
-+          ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+  enableval="$enable_dependency_tracking"
-+
-+fi;
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
-+
-+depcc="$CC"   am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      : > sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored.
-+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+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 "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+    test -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+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
-+
-+  test -n "$ac_ct_CXX" && break
-+done
-+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-+
-+  CXX=$ac_ct_CXX
-+fi
-+
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+     "checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+
-+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-+GXX=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
-+CXXFLAGS="-g"
-+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+if test "${ac_cv_prog_cxx_g+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_prog_cxx_g=no
-+fi
-+rm -f 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
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
-+for ac_declaration in \
-+   ''\
-+   '#include <stdlib.h>' \
-+   'extern "C" void std::exit (int) throw (); using std::exit;' \
-+   'extern "C" void std::exit (int); using std::exit;' \
-+   'extern "C" void exit (int) throw ();' \
-+   'extern "C" void exit (int);' \
-+   'void exit (int);'
-+do
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.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>&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.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$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
-+
-+depcc="$CXX"  am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      : > sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored.
-+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
- 
- 
--#AC_PROG_CXX
- #AC_PROG_AWK
- #AM_PROG_LEX
- #AC_PROG_YACC
- 
- #AC_CHECK_LIB(fl,main,AC_DEFINE(JS) LIBS="$LIBS -lfl",AC_MSG_WARN(You don't have libfl; you won't be able to run javascript))
- 
--echo $ac_n "checking for EMX""... $ac_c" 1>&6
--echo "configure:1046: checking for EMX" >&5
--if eval "test \"`echo '$''{'ac_cv_have_emx'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for EMX" >&5
-+echo $ECHO_N "checking for EMX... $ECHO_C" >&6
-+if test "${ac_cv_have_emx+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 1051 "configure"
--#include "confdefs.h"
- 
--int main() {
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
- #ifndef __EMX__
- 	kill me!
--	#endif 
--; return 0; }
--EOF
--if { (eval echo configure:1060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+	#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_emx=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_emx=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_have_emx=no
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
- 
--echo "$ac_t""$ac_cv_have_emx" 1>&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_emx" >&5
-+echo "${ECHO_T}$ac_cv_have_emx" >&6
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g" | sed "s/-Zbin-files//g"`
- 
--echo $ac_n "checking for typeof""... $ac_c" 1>&6
--echo "configure:1077: checking for typeof" >&5
--if eval "test \"`echo '$''{'ac_cv_have_typeof'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for typeof" >&5
-+echo $ECHO_N "checking for typeof... $ECHO_C" >&6
-+if test "${ac_cv_have_typeof+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 1082 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--int main() {
-+int
-+main ()
-+{
- int a;
- 	typeof(a) b;
--; return 0; }
--EOF
--if { (eval echo configure:1090: \"$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>&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_have_typeof=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_typeof=no
--fi
--rm -f conftest*
--	
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_typeof=no
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
- 
--echo "$ac_t""$ac_cv_have_typeof" 1>&6
--test "$ac_cv_have_typeof" = yes && cat >> confdefs.h <<\EOF
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_typeof" >&5
-+echo "${ECHO_T}$ac_cv_have_typeof" >&6
-+test "$ac_cv_have_typeof" = yes && cat >>confdefs.h <<\_ACEOF
- #define HAVE_TYPEOF 1
--EOF
-+_ACEOF
- 
- 
--echo $ac_n "checking for long long""... $ac_c" 1>&6
--echo "configure:1110: checking for long long" >&5
--if eval "test \"`echo '$''{'ac_cv_have_long_long'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6
-+if test "${ac_cv_have_long_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 1115 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--int main() {
--unsigned long long a; 
--; return 0; }
--EOF
--if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+int
-+main ()
-+{
-+unsigned long long a;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_long_long=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_long_long=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_have_long_long=no
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
- 
--echo "$ac_t""$ac_cv_have_long_long" 1>&6
--test "$ac_cv_have_long_long" = yes && cat >> confdefs.h <<\EOF
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_long_long" >&5
-+echo "${ECHO_T}$ac_cv_have_long_long" >&6
-+test "$ac_cv_have_long_long" = yes && cat >>confdefs.h <<\_ACEOF
- #define HAVE_LONG_LONG 1
--EOF
-+_ACEOF
-+
-+
-+
-+
-+
- 
- 
- ac_header_dirent=no
--for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:1146: checking for $ac_hdr that defines DIR" >&5
--if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 1151 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <sys/types.h>
- #include <$ac_hdr>
--int main() {
--DIR *dirp = 0;
--; return 0; }
--EOF
--if { (eval echo configure:1159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  eval "ac_cv_header_dirent_$ac_safe=yes"
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_Header=yes"
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_dirent_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--if eval "test \"`echo '$ac_cv_header_dirent_'$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
-- ac_header_dirent=$ac_hdr; break
--else
--  echo "$ac_t""no" 1>&6
-+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_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
- fi
-+
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:1184: checking for opendir in -ldir" >&5
--ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
--LIBS="-ldir  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1192 "configure"
--#include "confdefs.h"
-+  ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 opendir();
--
--int main() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:1203: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_search_opendir="none required"
- 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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  LIBS="$LIBS -ldir"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_opendir" = no; then
-+  for ac_lib in dir; do
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_search_opendir="-l$ac_lib"
-+break
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+  done
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+
- fi
- 
- else
--echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:1225: checking for opendir in -lx" >&5
--ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
--LIBS="-lx  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1233 "configure"
--#include "confdefs.h"
-+  ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 opendir();
--
--int main() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:1244: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_search_opendir="none required"
- 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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  LIBS="$LIBS -lx"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_opendir" = no; then
-+  for ac_lib in x; do
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_search_opendir="-l$ac_lib"
-+break
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+  done
- fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
- 
- fi
- 
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1267: checking how to run the C preprocessor" >&5
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
- fi
- if test -z "$CPP"; then
--if 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 1282 "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:1288: \"$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
-+#line $LINENO "configure"
-+/* 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
-+  else
-+    ac_cpp_err=
-+  fi
- 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 1299 "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:1305: \"$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
-+  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} -nologo -E"
--  cat > conftest.$ac_ext <<EOF
--#line 1316 "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:1322: \"$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
-+#line $LINENO "configure"
-+/* 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
-+  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
-+#line $LINENO "configure"
-+/* 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
-+  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=/lib/cpp
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  # Broken: fails on valid input.
-+continue
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether non-existent headers
-+  # can be detected and how.
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+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*
--  ac_cv_prog_CPP="$CPP"
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+  :
-+else
-+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+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
--  CPP="$ac_cv_prog_CPP"
-+
-+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
--  ac_cv_prog_CPP="$CPP"
-+  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 "$ac_t""$CPP" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
- 
--echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1347: checking for ANSI C header files" >&5
--if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+
-+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 <<EOF
--#line 1352 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1360: \"$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*
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_header_stdc=yes
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_header_stdc=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -f 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 <<EOF
--#line 1377 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <string.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "memchr" >/dev/null 2>&1; then
-+  $EGREP "memchr" >/dev/null 2>&1; then
-   :
- else
--  rm -rf conftest*
-   ac_cv_header_stdc=no
- fi
- rm -f conftest*
-@@ -1390,16 +3920,20 @@
- 
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--cat > conftest.$ac_ext <<EOF
--#line 1395 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "free" >/dev/null 2>&1; then
-+  $EGREP "free" >/dev/null 2>&1; then
-   :
- else
--  rm -rf conftest*
-   ac_cv_header_stdc=no
- fi
- rm -f conftest*
-@@ -1408,901 +3942,2658 @@
- 
- 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
-+  if test "$cross_compiling" = yes; then
-   :
- else
--  cat > conftest.$ac_ext <<EOF
--#line 1416 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <ctype.h>
--#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#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); }
-+#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
- 
--EOF
--if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+        || toupper (i) != TOUPPER (i))
-+      exit(2);
-+  exit (0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   :
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  ac_cv_header_stdc=no
-+  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 -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
- fi
--
--echo "$ac_t""$ac_cv_header_stdc" 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 <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define STDC_HEADERS 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:1451: checking for sys/wait.h that is POSIX.1 compatible" >&5
--if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_wait_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 1456 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
--#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
--int main() {
--int s;
--wait (&s);
--s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
--; return 0; }
--EOF
--if { (eval echo configure:1472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+
-+int
-+main ()
-+{
-+  int s;
-+  wait (&s);
-+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_header_sys_wait_h=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_header_sys_wait_h=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
- if test $ac_cv_header_sys_wait_h = yes; then
--  cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYS_WAIT_H 1
--EOF
-+_ACEOF
- 
- fi
- 
--for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h time.h unistd.h math.h ieee.h endian.h
-+# 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
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1496: 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
-+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 <<EOF
--#line 1501 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1506: \"$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"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- 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
-- 
-+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 fcntl.h limits.h sys/ioctl.h sys/time.h time.h unistd.h math.h ieee.h endian.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
--  echo "$ac_t""no" 1>&6
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in values.h
-+
-+for ac_header in values.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1536: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1541 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1546: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sigaction.h
-+
-+for ac_header in sigaction.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1576: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1581 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1586: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in netinet/in_systm.h
-+
-+for ac_header in netinet/in_systm.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1616: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1621 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1626: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in netinet/in_system.h
-+
-+for ac_header in netinet/in_system.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1656: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1661 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1666: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in netinet/ip.h
-+
-+for ac_header in netinet/ip.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1696: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1701 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1706: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sys/select.h
-+
-+for ac_header in sys/select.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1736: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1741 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1746: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sys/resource.h
-+
-+for ac_header in sys/resource.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1776: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1781 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1786: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sys/utsname.h
-+
-+for ac_header in sys/utsname.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1816: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1821 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1826: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sys/un.h
-+
-+for ac_header in sys/un.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1856: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1861 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1866: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sys/fmutex.h
-+
-+for ac_header in sys/fmutex.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1896: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1901 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1906: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in sys/cygwin.h
-+
-+for ac_header in sys/cygwin.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1936: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1941 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1946: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in io.h
-+
-+for ac_header in io.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1976: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 1981 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1986: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in setjmp.h
-+
-+for ac_header in setjmp.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2016: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 2021 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2026: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--for ac_hdr in langinfo.h
-+
-+for ac_header in langinfo.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2056: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 2061 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2066: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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 for working const""... $ac_c" 1>&6
--echo "configure:2094: checking for working const" >&5
--if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+if test "${ac_cv_c_const+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2099 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--int main() {
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-+  typedef int charset[2];
-+  const charset x;
-+  /* SunOS 4.1.1 cc rejects this.  */
-+  char const *const *ccp;
-+  char **p;
-+  /* NEC SVR4.0.2 mips cc rejects this.  */
-+  struct point {int x, y;};
-+  static struct point const zero = {0,0};
-+  /* AIX XL C 1.02.0.0 rejects this.
-+     It does not let you subtract one const X* pointer from another in
-+     an arm of an if-expression whose if-part is not a constant
-+     expression */
-+  const char *g = "string";
-+  ccp = &g + (g ? g-g : 0);
-+  /* HPUX 7.0 cc rejects these. */
-+  ++ccp;
-+  p = (char**) ccp;
-+  ccp = (char const *const *) p;
-+  { /* SCO 3.2v4 cc rejects this.  */
-+    char *t;
-+    char const *s = 0 ? (char *) 0 : (char const *) 0;
- 
--/* Ultrix mips cc rejects this.  */
--typedef int charset[2]; const charset x;
--/* SunOS 4.1.1 cc rejects this.  */
--char const *const *ccp;
--char **p;
--/* NEC SVR4.0.2 mips cc rejects this.  */
--struct point {int x, y;};
--static struct point const zero = {0,0};
--/* AIX XL C 1.02.0.0 rejects this.
--   It does not let you subtract one const X* pointer from another in an arm
--   of an if-expression whose if-part is not a constant expression */
--const char *g = "string";
--ccp = &g + (g ? g-g : 0);
--/* HPUX 7.0 cc rejects these. */
--++ccp;
--p = (char**) ccp;
--ccp = (char const *const *) p;
--{ /* SCO 3.2v4 cc rejects this.  */
--  char *t;
--  char const *s = 0 ? (char *) 0 : (char const *) 0;
-+    *t++ = 0;
-+  }
-+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+    int x[] = {25, 17};
-+    const int *foo = &x[0];
-+    ++foo;
-+  }
-+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+    typedef const int *iptr;
-+    iptr p = 0;
-+    ++p;
-+  }
-+  { /* AIX XL C 1.02.0.0 rejects this saying
-+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+    struct s { int j; const int *ap[3]; };
-+    struct s *b; b->j = 5;
-+  }
-+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+    const int foo = 10;
-+  }
-+#endif
- 
--  *t++ = 0;
--}
--{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
--  int x[] = {25, 17};
--  const int *foo = &x[0];
--  ++foo;
--}
--{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
--  typedef const int *iptr;
--  iptr p = 0;
--  ++p;
--}
--{ /* AIX XL C 1.02.0.0 rejects this saying
--     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
--  struct s { int j; const int *ap[3]; };
--  struct s *b; b->j = 5;
--}
--{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
--  const int foo = 10;
-+  ;
-+  return 0;
- }
--
--; return 0; }
--EOF
--if { (eval echo configure:2148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_c_const=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_c_const=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_c_const" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
--  cat >> confdefs.h <<\EOF
--#define const 
--EOF
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define const
-+_ACEOF
- 
- fi
- 
--echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:2169: checking for inline" >&5
--if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+if test "${ac_cv_c_inline+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
--  cat > conftest.$ac_ext <<EOF
--#line 2176 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
- 
--int main() {
--} $ac_kw foo() {
--; return 0; }
--EOF
--if { (eval echo configure:2183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- done
- 
- fi
--
--echo "$ac_t""$ac_cv_c_inline" 1>&6
--case "$ac_cv_c_inline" in
-+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6
-+case $ac_cv_c_inline in
-   inline | yes) ;;
--  no) cat >> confdefs.h <<\EOF
--#define inline 
--EOF
-+  no)
-+cat >>confdefs.h <<\_ACEOF
-+#define inline
-+_ACEOF
-  ;;
--  *)  cat >> confdefs.h <<EOF
-+  *)  cat >>confdefs.h <<_ACEOF
- #define inline $ac_cv_c_inline
--EOF
-+_ACEOF
-  ;;
- esac
- 
--echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:2209: checking for size_t" >&5
--if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+if test "${ac_cv_type_size_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2214 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#include <stddef.h>
--#endif
--EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
--  rm -rf conftest*
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((size_t *) 0)
-+  return 0;
-+if (sizeof (size_t))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_type_size_t=yes
- else
--  rm -rf conftest*
--  ac_cv_type_size_t=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_type_size_t=no
- fi
--echo "$ac_t""$ac_cv_type_size_t" 1>&6
--if test $ac_cv_type_size_t = no; then
--  cat >> confdefs.h <<\EOF
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+if test $ac_cv_type_size_t = yes; then
-+  :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
- #define size_t unsigned
--EOF
-+_ACEOF
- 
- fi
- 
--echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:2242: 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
-+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 <<EOF
--#line 2247 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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:2256: \"$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>&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.$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
- 
--echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
--echo "configure:2277: checking whether struct tm is in sys/time.h or time.h" >&5
--if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-+if test "${ac_cv_struct_tm+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2282 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <sys/types.h>
- #include <time.h>
--int main() {
-+
-+int
-+main ()
-+{
- struct tm *tp; tp->tm_sec;
--; return 0; }
--EOF
--if { (eval echo configure:2290: \"$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>&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_struct_tm=time.h
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_struct_tm=sys/time.h
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_struct_tm=sys/time.h
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_struct_tm" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+echo "${ECHO_T}$ac_cv_struct_tm" >&6
- if test $ac_cv_struct_tm = sys/time.h; then
--  cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define TM_IN_SYS_TIME 1
--EOF
-+_ACEOF
- 
- fi
- 
-@@ -2315,251 +6606,2187 @@
- 	default_int=0
- fi
- 
--echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:2320: checking size of short" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6
-+if test "${ac_cv_type_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((short *) 0)
-+  return 0;
-+if (sizeof (short))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_short=yes
- else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_short=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6
-+
-+echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_short" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_short="$default_short"
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2328 "configure"
--#include "confdefs.h"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+                    if test $ac_lo -le $ac_mid; then
-+                      ac_lo= ac_hi=
-+                      break
-+                    fi
-+                    ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+                       if test $ac_mid -le $ac_hi; then
-+                         ac_lo= ac_hi=
-+                         break
-+                       fi
-+                       ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_short=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
-+else
-+  if test "$cross_compiling" = yes; then
-+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (short)); }
-+unsigned long ulongval () { return (long) (sizeof (short)); }
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int
-+main ()
- {
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(short));
--  exit(0);
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    exit (1);
-+  if (((long) (sizeof (short))) < 0)
-+    {
-+      long i = longval ();
-+      if (i != ((long) (sizeof (short))))
-+	exit (1);
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long i = ulongval ();
-+      if (i != ((long) (sizeof (short))))
-+	exit (1);
-+      fprintf (f, "%lu\n", i);
-+    }
-+  exit (ferror (f) || fclose (f) != 0);
-+
-+  ;
-+  return 0;
- }
--EOF
--if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_sizeof_short=`cat conftestval`
-+_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
-+  ac_cv_sizeof_short=`cat conftest.val`
-+else
-+  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 )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (short), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
-   ac_cv_sizeof_short=0
- fi
--rm -fr conftest*
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SHORT $ac_cv_sizeof_short
-+_ACEOF
-+
- 
-+echo "$as_me:$LINENO: checking for unsigned short" >&5
-+echo $ECHO_N "checking for unsigned short... $ECHO_C" >&6
-+if test "${ac_cv_type_unsigned_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((unsigned short *) 0)
-+  return 0;
-+if (sizeof (unsigned short))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_unsigned_short=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_unsigned_short=no
- fi
--echo "$ac_t""$ac_cv_sizeof_short" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_SHORT $ac_cv_sizeof_short
--EOF
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_short" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6
- 
-+echo "$as_me:$LINENO: checking size of unsigned short" >&5
-+echo $ECHO_N "checking size of unsigned short... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_unsigned_short+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_unsigned_short" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) >= 0)];
-+test_array [0] = 0
- 
--echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6
--echo "configure:2359: checking size of unsigned short" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+                    if test $ac_lo -le $ac_mid; then
-+                      ac_lo= ac_hi=
-+                      break
-+                    fi
-+                    ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+                       if test $ac_mid -le $ac_hi; then
-+                         ac_lo= ac_hi=
-+                         break
-+                       fi
-+                       ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned short))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_unsigned_short=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned short), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_unsigned_short="$default_short"
-+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2367 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (unsigned short)); }
-+unsigned long ulongval () { return (long) (sizeof (unsigned short)); }
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int
-+main ()
- {
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(unsigned short));
--  exit(0);
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    exit (1);
-+  if (((long) (sizeof (unsigned short))) < 0)
-+    {
-+      long i = longval ();
-+      if (i != ((long) (sizeof (unsigned short))))
-+	exit (1);
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long i = ulongval ();
-+      if (i != ((long) (sizeof (unsigned short))))
-+	exit (1);
-+      fprintf (f, "%lu\n", i);
-+    }
-+  exit (ferror (f) || fclose (f) != 0);
-+
-+  ;
-+  return 0;
- }
--EOF
--if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_sizeof_unsigned_short=`cat conftestval`
-+_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
-+  ac_cv_sizeof_unsigned_short=`cat conftest.val`
-+else
-+  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 )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned short), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
-   ac_cv_sizeof_unsigned_short=0
- fi
--rm -fr conftest*
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_unsigned_short" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short
-+_ACEOF
-+
- 
-+echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6
-+if test "${ac_cv_type_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((int *) 0)
-+  return 0;
-+if (sizeof (int))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_int=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_int=no
- fi
--echo "$ac_t""$ac_cv_sizeof_unsigned_short" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short
--EOF
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6
- 
-+echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_int" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+test_array [0] = 0
- 
--echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:2398: checking size of int" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+                    if test $ac_lo -le $ac_mid; then
-+                      ac_lo= ac_hi=
-+                      break
-+                    fi
-+                    ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+                       if test $ac_mid -le $ac_hi; then
-+                         ac_lo= ac_hi=
-+                         break
-+                       fi
-+                       ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_int=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_int="$default_int"
-+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2406 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (int)); }
-+unsigned long ulongval () { return (long) (sizeof (int)); }
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int
-+main ()
- {
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(int));
--  exit(0);
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    exit (1);
-+  if (((long) (sizeof (int))) < 0)
-+    {
-+      long i = longval ();
-+      if (i != ((long) (sizeof (int))))
-+	exit (1);
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long i = ulongval ();
-+      if (i != ((long) (sizeof (int))))
-+	exit (1);
-+      fprintf (f, "%lu\n", i);
-+    }
-+  exit (ferror (f) || fclose (f) != 0);
-+
-+  ;
-+  return 0;
- }
--EOF
--if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_sizeof_int=`cat conftestval`
-+_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
-+  ac_cv_sizeof_int=`cat conftest.val`
-+else
-+  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 )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
-   ac_cv_sizeof_int=0
- fi
--rm -fr conftest*
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
-+
- 
-+echo "$as_me:$LINENO: checking for unsigned" >&5
-+echo $ECHO_N "checking for unsigned... $ECHO_C" >&6
-+if test "${ac_cv_type_unsigned+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((unsigned *) 0)
-+  return 0;
-+if (sizeof (unsigned))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_unsigned=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_unsigned=no
- fi
--echo "$ac_t""$ac_cv_sizeof_int" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_INT $ac_cv_sizeof_int
--EOF
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_unsigned" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned" >&6
- 
-+echo "$as_me:$LINENO: checking size of unsigned" >&5
-+echo $ECHO_N "checking size of unsigned... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_unsigned+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_unsigned" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned))) >= 0)];
-+test_array [0] = 0
- 
--echo $ac_n "checking size of unsigned""... $ac_c" 1>&6
--echo "configure:2437: checking size of unsigned" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+                    if test $ac_lo -le $ac_mid; then
-+                      ac_lo= ac_hi=
-+                      break
-+                    fi
-+                    ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+                       if test $ac_mid -le $ac_hi; then
-+                         ac_lo= ac_hi=
-+                         break
-+                       fi
-+                       ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_unsigned=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_unsigned="$default_int"
-+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2445 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (unsigned)); }
-+unsigned long ulongval () { return (long) (sizeof (unsigned)); }
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int
-+main ()
- {
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(unsigned));
--  exit(0);
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    exit (1);
-+  if (((long) (sizeof (unsigned))) < 0)
-+    {
-+      long i = longval ();
-+      if (i != ((long) (sizeof (unsigned))))
-+	exit (1);
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long i = ulongval ();
-+      if (i != ((long) (sizeof (unsigned))))
-+	exit (1);
-+      fprintf (f, "%lu\n", i);
-+    }
-+  exit (ferror (f) || fclose (f) != 0);
-+
-+  ;
-+  return 0;
- }
--EOF
--if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_sizeof_unsigned=`cat conftestval`
-+_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
-+  ac_cv_sizeof_unsigned=`cat conftest.val`
-+else
-+  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 )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
-   ac_cv_sizeof_unsigned=0
- fi
--rm -fr conftest*
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_unsigned" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned
-+_ACEOF
-+
-+
-+echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6
-+if test "${ac_cv_type_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((long *) 0)
-+  return 0;
-+if (sizeof (long))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_type_long=no
- fi
--echo "$ac_t""$ac_cv_sizeof_unsigned" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned
--EOF
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6
- 
-+echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_long" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+test_array [0] = 0
- 
--echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:2476: checking size of long" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+                    if test $ac_lo -le $ac_mid; then
-+                      ac_lo= ac_hi=
-+                      break
-+                    fi
-+                    ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+                       if test $ac_mid -le $ac_hi; then
-+                         ac_lo= ac_hi=
-+                         break
-+                       fi
-+                       ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_long="$default_int"
-+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2484 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (long)); }
-+unsigned long ulongval () { return (long) (sizeof (long)); }
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int
-+main ()
- {
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(long));
--  exit(0);
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    exit (1);
-+  if (((long) (sizeof (long))) < 0)
-+    {
-+      long i = longval ();
-+      if (i != ((long) (sizeof (long))))
-+	exit (1);
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long i = ulongval ();
-+      if (i != ((long) (sizeof (long))))
-+	exit (1);
-+      fprintf (f, "%lu\n", i);
-+    }
-+  exit (ferror (f) || fclose (f) != 0);
-+
-+  ;
-+  return 0;
- }
--EOF
--if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_sizeof_long=`cat conftestval`
-+_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
-+  ac_cv_sizeof_long=`cat conftest.val`
-+else
-+  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 )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
-   ac_cv_sizeof_long=0
- fi
--rm -fr conftest*
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
- 
-+echo "$as_me:$LINENO: checking for unsigned long" >&5
-+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
-+if test "${ac_cv_type_unsigned_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((unsigned long *) 0)
-+  return 0;
-+if (sizeof (unsigned long))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_unsigned_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_unsigned_long=no
- fi
--echo "$ac_t""$ac_cv_sizeof_long" 1>&6
--cat >> confdefs.h <<EOF
--#define SIZEOF_LONG $ac_cv_sizeof_long
--EOF
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
- 
-+echo "$as_me:$LINENO: checking size of unsigned long" >&5
-+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_unsigned_long" = yes; then
-+  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+  # This bug is HP SR number 8606223364.
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
-+test_array [0] = 0
- 
--echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
--echo "configure:2515: checking size of unsigned long" >&5
--if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr $ac_mid + 1`
-+                    if test $ac_lo -le $ac_mid; then
-+                      ac_lo= ac_hi=
-+                      break
-+                    fi
-+                    ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+                       if test $ac_mid -le $ac_hi; then
-+                         ac_lo= ac_hi=
-+                         break
-+                       fi
-+                       ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo= ac_hi=
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_unsigned_long="$default_int"
-+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2523 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+long longval () { return (long) (sizeof (unsigned long)); }
-+unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
- #include <stdio.h>
--main()
-+#include <stdlib.h>
-+int
-+main ()
- {
--  FILE *f=fopen("conftestval", "w");
--  if (!f) exit(1);
--  fprintf(f, "%d\n", sizeof(unsigned long));
--  exit(0);
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    exit (1);
-+  if (((long) (sizeof (unsigned long))) < 0)
-+    {
-+      long i = longval ();
-+      if (i != ((long) (sizeof (unsigned long))))
-+	exit (1);
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long i = ulongval ();
-+      if (i != ((long) (sizeof (unsigned long))))
-+	exit (1);
-+      fprintf (f, "%lu\n", i);
-+    }
-+  exit (ferror (f) || fclose (f) != 0);
-+
-+  ;
-+  return 0;
- }
--EOF
--if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_sizeof_unsigned_long=`cat conftestval`
-+_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
-+  ac_cv_sizeof_unsigned_long=`cat conftest.val`
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  ac_cv_sizeof_unsigned_long=0
-+  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 )
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
- fi
--rm -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
--echo "$ac_t""$ac_cv_sizeof_unsigned_long" 1>&6
--cat >> confdefs.h <<EOF
-+rm -f conftest.val
-+else
-+  ac_cv_sizeof_unsigned_long=0
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
-+cat >>confdefs.h <<_ACEOF
- #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
--EOF
-+_ACEOF
- 
- 
--echo $ac_n "checking for big endian""... $ac_c" 1>&6
--echo "configure:2554: checking for big endian" >&5
--if eval "test \"`echo '$''{'ac_cv_big_endian'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for big endian" >&5
-+echo $ECHO_N "checking for big endian... $ECHO_C" >&6
-+if test "${ac_cv_big_endian+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
-   ac_cv_big_endian=no
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2562 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- 	long l;
- 	char *c = (char *)&l;
-@@ -2568,35 +8795,49 @@
- 		l = 0x12345678L;
- 		return !(c[sizeof(long) - 1] == 0x78 && c[sizeof(long) - 2] == 0x56 && c[sizeof(long) - 3] == 0x34 && c[sizeof(long) - 4] == 0x12);
- 	}
--	
--EOF
--if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+
-+_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
-   ac_cv_big_endian=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  ac_cv_big_endian=no
-+  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_big_endian=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
--
- fi
--
--echo "$ac_t""$ac_cv_big_endian" 1>&6
--echo $ac_n "checking for little endian""... $ac_c" 1>&6
--echo "configure:2591: checking for little endian" >&5
--if eval "test \"`echo '$''{'ac_cv_little_endian'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_big_endian" >&5
-+echo "${ECHO_T}$ac_cv_big_endian" >&6
-+echo "$as_me:$LINENO: checking for little endian" >&5
-+echo $ECHO_N "checking for little endian... $ECHO_C" >&6
-+if test "${ac_cv_little_endian+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
-   ac_cv_little_endian="$ac_cv_have_emx"
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2599 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
- 	long l;
- 	char *c = (char *)&l;
-@@ -2605,133 +8846,194 @@
- 		l = 0x12345678L;
- 		return !(c[0] == 0x78 && c[1] == 0x56 && c[2] == 0x34 && c[3] == 0x12);
- 	}
--	
--EOF
--if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+
-+_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
-   ac_cv_little_endian=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  ac_cv_little_endian=no
-+  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_little_endian=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
--
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_little_endian" >&5
-+echo "${ECHO_T}$ac_cv_little_endian" >&6
-+
-+
- 
--echo "$ac_t""$ac_cv_little_endian" 1>&6
- 
- if test "$ac_cv_big_endian" = yes; then
--	cat >> confdefs.h <<\EOF
--#define AC_BIG_ENDIAN 1
--EOF
-+	cat >>confdefs.h <<\_ACEOF
-+#define  1
-+_ACEOF
- 
- else if test "$ac_cv_little_endian" = yes; then
--	cat >> confdefs.h <<\EOF
--#define AC_LITTLE_ENDIAN 1
--EOF
-+	cat >>confdefs.h <<\_ACEOF
-+#define  1
-+_ACEOF
- 
- fi
- fi
- 
--if test $ac_cv_prog_gcc = yes; then
--    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
--echo "configure:2643: checking whether ${CC-cc} needs -traditional" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+if test $ac_cv_c_compiler_gnu = yes; then
-+    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-+if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
--  cat > conftest.$ac_ext <<EOF
--#line 2649 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <sgtty.h>
- Autoconf TIOCGETP
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "$ac_pattern" >/dev/null 2>&1; then
--  rm -rf conftest*
-+  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-   ac_cv_prog_gcc_traditional=yes
- else
--  rm -rf conftest*
-   ac_cv_prog_gcc_traditional=no
- fi
- rm -f conftest*
- 
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
--    cat > conftest.$ac_ext <<EOF
--#line 2667 "configure"
--#include "confdefs.h"
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <termio.h>
- Autoconf TCGETA
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "$ac_pattern" >/dev/null 2>&1; then
--  rm -rf conftest*
-+  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-   ac_cv_prog_gcc_traditional=yes
- fi
- rm -f conftest*
- 
-   fi
- fi
--
--echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:2689: checking for 8-bit clean memcmp" >&5
--if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for working memcmp" >&5
-+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-+if test "${ac_cv_func_memcmp_working+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_func_memcmp_clean=no
-+  ac_cv_func_memcmp_working=no
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2697 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--main()
-+int
-+main ()
- {
-+
-+  /* Some versions of memcmp are not 8-bit clean.  */
-   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
--  exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
--}
-+  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-+    exit (1);
- 
--EOF
--if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  ac_cv_func_memcmp_clean=yes
-+  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-+     or more and with at least one buffer not starting on a 4-byte boundary.
-+     William Lewis provided this test program.   */
-+  {
-+    char foo[21];
-+    char bar[21];
-+    int i;
-+    for (i = 0; i < 4; i++)
-+      {
-+        char *a = foo + i;
-+        char *b = bar + i;
-+        strcpy (a, "--------01111111");
-+        strcpy (b, "--------10000000");
-+        if (memcmp (a, b, 16) >= 0)
-+          exit (1);
-+      }
-+    exit (0);
-+  }
-+
-+  ;
-+  return 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
-+  ac_cv_func_memcmp_working=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  ac_cv_func_memcmp_clean=no
-+  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_func_memcmp_working=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-+test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- 
--echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
--test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
--
--echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:2725: 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
-+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 <<EOF
--#line 2730 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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);
-@@ -2739,1144 +9041,1737 @@
- void (*signal ()) ();
- #endif
- 
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:2747: \"$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>&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.$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 for strftime""... $ac_c" 1>&6
--echo "configure:2766: checking for strftime" >&5
--if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+
-+for ac_func in strftime
-+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 <<EOF
--#line 2771 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char strftime(); 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
- /* 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 strftime();
--
--int main() {
--
-+   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_strftime) || defined (__stub___strftime)
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--strftime();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_strftime=yes"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_strftime=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'strftime`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
--#define HAVE_STRFTIME 1
--EOF
-+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 "$ac_t""no" 1>&6
--# strftime is in -lintl on SCO UNIX.
--echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
--echo "configure:2816: checking for strftime in -lintl" >&5
--ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+  # strftime is in -lintl on SCO UNIX.
-+echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
-+echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
-+if test "${ac_cv_lib_intl_strftime+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2824 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 strftime();
--
--int main() {
--strftime()
--; return 0; }
--EOF
--if { (eval echo configure:2835: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char strftime ();
-+int
-+main ()
-+{
-+strftime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_intl_strftime=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_intl_strftime=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
-+echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
-+if test $ac_cv_lib_intl_strftime = yes; then
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRFTIME 1
--EOF
-+_ACEOF
- 
- LIBS="-lintl $LIBS"
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- fi
-+done
- 
--echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:2862: checking for vprintf" >&5
--if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+
-+for ac_func in vprintf
-+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 <<EOF
--#line 2867 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char vprintf(); 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
- /* 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 vprintf();
--
--int main() {
--
-+   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_vprintf) || defined (__stub___vprintf)
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--vprintf();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_vprintf=yes"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_vprintf=no"
--fi
--rm -f conftest*
--fi
--
--if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
--#define HAVE_VPRINTF 1
--EOF
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--else
--  echo "$ac_t""no" 1>&6
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if test "$ac_cv_func_vprintf" != yes; then
--echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:2914: checking for _doprnt" >&5
--if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for _doprnt" >&5
-+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-+if test "${ac_cv_func__doprnt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2919 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char _doprnt(); below.  */
--#include <assert.h>
-+    which can conflict with char _doprnt (); 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
- /* 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 _doprnt();
--
--int main() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char _doprnt ();
- /* 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__doprnt) || defined (__stub____doprnt)
- choke me
- #else
--_doprnt();
-+char (*f) () = _doprnt;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func__doprnt=yes"
-+int
-+main ()
-+{
-+return f != _doprnt;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func__doprnt=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func__doprnt=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func__doprnt=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-+echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-+if test $ac_cv_func__doprnt = yes; then
- 
--if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_DOPRNT 1
--EOF
-+_ACEOF
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- fi
-+done
-+
-+
- 
- for ac_func in calloc
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2969: 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
-+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 <<EOF
--#line 2974 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:2997: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in snprintf
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3024: 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
-+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 <<EOF
--#line 3029 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3052: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_func in gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3079: 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
-+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 <<EOF
--#line 3084 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3107: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
-+
-+
-+
-+
- for ac_func in getpid setpgid getpgid setpgrp getpgrp
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3134: 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
-+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 <<EOF
--#line 3139 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3162: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in popen
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3189: 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
-+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 <<EOF
--#line 3194 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3217: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in uname
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3244: 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
-+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 <<EOF
--#line 3249 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3272: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in strptime
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3299: 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
-+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 <<EOF
--#line 3304 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3327: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in setlocale
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3354: 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
-+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 <<EOF
--#line 3359 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3382: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in nl_langinfo
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3409: 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
-+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 <<EOF
--#line 3414 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3437: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
- 
--echo $ac_n "checking for sigsetjmp/siglongjmp""... $ac_c" 1>&6
--echo "configure:3463: checking for sigsetjmp/siglongjmp" >&5
--if eval "test \"`echo '$''{'ac_cv_have_sigsetjmp'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for sigsetjmp/siglongjmp" >&5
-+echo $ECHO_N "checking for sigsetjmp/siglongjmp... $ECHO_C" >&6
-+if test "${ac_cv_have_sigsetjmp+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 3468 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <setjmp.h>
--int main() {
-+int
-+main ()
-+{
- sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);
--; return 0; }
--EOF
--if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_sigsetjmp=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_sigsetjmp=no
--fi
--rm -f conftest*
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_have_sigsetjmp=no
- fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
--echo "$ac_t""$ac_cv_have_sigsetjmp" 1>&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_sigsetjmp" >&5
-+echo "${ECHO_T}$ac_cv_have_sigsetjmp" >&6
- if test "$ac_cv_have_sigsetjmp" = yes; then
--	cat >> confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define HAVE_SIGSETJMP 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
--echo "configure:3497: checking for atan in -lm" >&5
--ac_lib_var=`echo m'_'atan | 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 atan in -lm" >&5
-+echo $ECHO_N "checking for atan in -lm... $ECHO_C" >&6
-+if test "${ac_cv_lib_m_atan+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3505 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 atan();
--
--int main() {
--atan()
--; return 0; }
--EOF
--if { (eval echo configure:3516: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char atan ();
-+int
-+main ()
-+{
-+atan ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_m_atan=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_m_atan=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_m_atan" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_atan" >&6
-+if test $ac_cv_lib_m_atan = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBM 1
-+_ACEOF
- 
-   LIBS="-lm $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 
--echo $ac_n "checking for socket""... $ac_c" 1>&6
--echo "configure:3545: checking for socket" >&5
--if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for socket" >&5
-+echo $ECHO_N "checking for socket... $ECHO_C" >&6
-+if test "${ac_cv_func_socket+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 3550 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char socket(); below.  */
--#include <assert.h>
-+    which can conflict with char socket (); 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
- /* 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() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char socket ();
- /* 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_socket) || defined (__stub___socket)
- choke me
- #else
--socket();
-+char (*f) () = socket;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_socket=yes"
-+int
-+main ()
-+{
-+return f != socket;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_socket=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_socket=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_socket=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
-+echo "${ECHO_T}$ac_cv_func_socket" >&6
-+if test $ac_cv_func_socket = yes; then
-   cf_result=yes
- else
--  echo "$ac_t""no" 1>&6
--cf_result=no
-+  cf_result=no
- fi
- 
- if test "$cf_result" = no; then
--	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:3595: 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
-+
-+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_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3603 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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; }
--EOF
--if { (eval echo configure:3614: \"$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"
-+   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>&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 "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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_socket_socket=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+if test $ac_cv_lib_socket_socket = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
- 
-   LIBS="-lsocket $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- fi
--echo $ac_n "checking for setsockopt""... $ac_c" 1>&6
--echo "configure:3643: checking for setsockopt" >&5
--if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for setsockopt" >&5
-+echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
-+if test "${ac_cv_func_setsockopt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 3648 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char setsockopt(); below.  */
--#include <assert.h>
-+    which can conflict with char setsockopt (); 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
- /* 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 setsockopt();
--
--int main() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char setsockopt ();
- /* 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_setsockopt) || defined (__stub___setsockopt)
- choke me
- #else
--setsockopt();
-+char (*f) () = setsockopt;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_setsockopt=yes"
-+int
-+main ()
-+{
-+return f != setsockopt;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_setsockopt=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_setsockopt=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_setsockopt=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'setsockopt`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-+echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-+if test $ac_cv_func_setsockopt = yes; then
-   cf_result=yes
- else
--  echo "$ac_t""no" 1>&6
--cf_result=no
-+  cf_result=no
- fi
- 
- if test "$cf_result" = no; then
--	echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
--echo "configure:3693: checking for setsockopt in -lsocket" >&5
--ac_lib_var=`echo socket'_'setsockopt | 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 setsockopt in -lsocket" >&5
-+echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3701 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 setsockopt();
--
--int main() {
--setsockopt()
--; return 0; }
--EOF
--if { (eval echo configure:3712: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char setsockopt ();
-+int
-+main ()
-+{
-+setsockopt ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_socket_setsockopt=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_socket_setsockopt=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
-+if test $ac_cv_lib_socket_setsockopt = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
- 
-   LIBS="-lsocket $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- fi
- 
- #AC_MSG_CHECKING([for gethostbyname])
--#AC_TRY_LINK([#include <netdb.h>], [gethostbyname("")], cf_result=yes, cf_result=no)
-+#AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[gethostbyname("")]])],[cf_result=yes],[cf_result=no])
- #AC_MSG_RESULT($cf_result)
--echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:3745: checking for gethostbyname" >&5
--if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+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 <<EOF
--#line 3750 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char gethostbyname(); below.  */
--#include <assert.h>
-+    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.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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() {
--
-+   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:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_gethostbyname=yes"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_gethostbyname=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_gethostbyname=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-+if test $ac_cv_func_gethostbyname = yes; then
-   cf_result=yes
- else
--  echo "$ac_t""no" 1>&6
--cf_result=no
-+  cf_result=no
- fi
- 
- if test "$cf_result" = no; then
--	echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6
--echo "configure:3795: checking for gethostbyname in -lsocket" >&5
--ac_lib_var=`echo socket'_'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 -lsocket" >&5
-+echo $ECHO_N "checking for gethostbyname in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3803 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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; }
--EOF
--if { (eval echo configure:3814: \"$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"
-+   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>&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_gethostbyname=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_socket_gethostbyname=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_gethostbyname" >&6
-+if test $ac_cv_lib_socket_gethostbyname = yes; then
-   cf_result=yes
- else
--  echo "$ac_t""no" 1>&6
--cf_result=no
-+  cf_result=no
- fi
- 
- 	if test "$cf_result" = no; then
--		echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:3837: 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 3845 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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; }
--EOF
--if { (eval echo configure:3856: \"$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"
-+   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>&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 "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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_nsl_gethostbyname=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+if test $ac_cv_lib_nsl_gethostbyname = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
-+_ACEOF
- 
-   LIBS="-lnsl $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 	else
-@@ -3884,333 +10779,555 @@
- 	fi
- fi
- 
--echo $ac_n "checking for herror""... $ac_c" 1>&6
--echo "configure:3889: checking for herror" >&5
--if eval "test \"`echo '$''{'ac_cv_func_herror'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for herror" >&5
-+echo $ECHO_N "checking for herror... $ECHO_C" >&6
-+if test "${ac_cv_func_herror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 3894 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char herror(); below.  */
--#include <assert.h>
-+    which can conflict with char herror (); 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
- /* 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 herror();
--
--int main() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char herror ();
- /* 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_herror) || defined (__stub___herror)
- choke me
- #else
--herror();
-+char (*f) () = herror;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_herror=yes"
-+int
-+main ()
-+{
-+return f != herror;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_herror=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_herror=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_herror=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'herror`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
-+echo "$as_me:$LINENO: result: $ac_cv_func_herror" >&5
-+echo "${ECHO_T}$ac_cv_func_herror" >&6
-+if test $ac_cv_func_herror = yes; then
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_HERROR 1
--EOF
-+_ACEOF
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for cfmakeraw""... $ac_c" 1>&6
--echo "configure:3940: checking for cfmakeraw" >&5
--if eval "test \"`echo '$''{'ac_cv_func_cfmakeraw'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for cfmakeraw" >&5
-+echo $ECHO_N "checking for cfmakeraw... $ECHO_C" >&6
-+if test "${ac_cv_func_cfmakeraw+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 3945 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char cfmakeraw(); below.  */
--#include <assert.h>
-+    which can conflict with char cfmakeraw (); 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
- /* 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 cfmakeraw();
--
--int main() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char cfmakeraw ();
- /* 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_cfmakeraw) || defined (__stub___cfmakeraw)
- choke me
- #else
--cfmakeraw();
-+char (*f) () = cfmakeraw;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_cfmakeraw=yes"
-+int
-+main ()
-+{
-+return f != cfmakeraw;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_cfmakeraw=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_cfmakeraw=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_cfmakeraw=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'cfmakeraw`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
-+echo "$as_me:$LINENO: result: $ac_cv_func_cfmakeraw" >&5
-+echo "${ECHO_T}$ac_cv_func_cfmakeraw" >&6
-+if test $ac_cv_func_cfmakeraw = yes; then
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_CFMAKERAW 1
--EOF
-+_ACEOF
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 
-+
- for ac_func in cygwin_conv_to_full_win32_path
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3994: 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
-+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 <<EOF
--#line 3999 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:4022: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
- 
--echo $ac_n "checking if you want to enable javascript""... $ac_c" 1>&6
--echo "configure:4048: checking if you want to enable javascript" >&5
-+echo "$as_me:$LINENO: checking if you want to enable javascript" >&5
-+echo $ECHO_N "checking if you want to enable javascript... $ECHO_C" >&6
- # Check whether --enable-javascript or --disable-javascript was given.
- if test "${enable_javascript+set}" = set; then
-   enableval="$enable_javascript"
-   cf_use_javascript=yes
- else
-   cf_use_javascript=no
--fi
--
--echo "$ac_t""$cf_use_javascript" 1>&6
-+fi;
-+echo "$as_me:$LINENO: result: $cf_use_javascript" >&5
-+echo "${ECHO_T}$cf_use_javascript" >&6
- if test "$cf_use_javascript" = yes; then
--	cat >> confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define JS 1
--EOF
-+_ACEOF
- 
- fi
- 
-+
- # Check whether --with-libfl or --without-libfl was given.
- if test "${with_libfl+set}" = set; then
-   withval="$with_libfl"
-   LIBS="$LIBS -lfl"
- else
--  cat >> confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define CHCEME_FLEXI_LIBU 1
--EOF
--
--fi
-+_ACEOF
- 
-+fi;
- 
--echo $ac_n "checking if you want to use graphics""... $ac_c" 1>&6
--echo "configure:4078: checking if you want to use graphics" >&5
-+echo "$as_me:$LINENO: checking if you want to use graphics" >&5
-+echo $ECHO_N "checking if you want to use graphics... $ECHO_C" >&6
- # Check whether --enable-graphics or --disable-graphics was given.
- if test "${enable_graphics+set}" = set; then
-   enableval="$enable_graphics"
-   cf_use_graphics=yes
- else
-   cf_use_graphics=no
--fi
-+fi;
-+echo "$as_me:$LINENO: result: $cf_use_graphics" >&5
-+echo "${ECHO_T}$cf_use_graphics" >&6
- 
--echo "$ac_t""$cf_use_graphics" 1>&6
- 
--echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
--echo "configure:4090: checking for Gpm_Open in -lgpm" >&5
--ac_lib_var=`echo gpm'_'Gpm_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
-+echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5
-+echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
-+if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4098 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 Gpm_Open();
--
--int main() {
--Gpm_Open()
--; return 0; }
--EOF
--if { (eval echo configure:4109: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char Gpm_Open ();
-+int
-+main ()
-+{
-+Gpm_Open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_gpm_Gpm_Open=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_gpm_Gpm_Open=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo gpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
-+if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGPM 1
-+_ACEOF
- 
-   LIBS="-lgpm $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- cf_have_gpm_lib=$ac_cv_lib_gpm_Gpm_Open
--for ac_hdr in gpm.h
-+
-+for ac_header in gpm.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4141: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 4146 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4151: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
- cf_have_gpm_includes=$ac_cv_header_gpm_h
- if test "$cf_have_gpm_lib" = yes && test "$cf_have_gpm_includes" = yes ; then cf_have_gpm=yes ; else cf_have_gpm=no; fi
- 
--echo $ac_n "checking for OS/2 threads""... $ac_c" 1>&6
--echo "configure:4181: checking for OS/2 threads" >&5
--if eval "test \"`echo '$''{'ac_cv_have_beginthread'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for OS/2 threads" >&5
-+echo $ECHO_N "checking for OS/2 threads... $ECHO_C" >&6
-+if test "${ac_cv_have_beginthread+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   CFLAGS_X="$CFLAGS"
- 	CFLAGS="$CFLAGS -Zmt"
--	cat > conftest.$ac_ext <<EOF
--#line 4188 "configure"
--#include "confdefs.h"
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <stdlib.h>
--int main() {
-+int
-+main ()
-+{
- _beginthread(NULL, NULL, 0, NULL)
--; return 0; }
--EOF
--if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_beginthread=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_beginthread=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_beginthread=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	CFLAGS="$CFLAGS_X"
- 
- fi
--
--echo "$ac_t""$ac_cv_have_beginthread" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_have_beginthread" >&5
-+echo "${ECHO_T}$ac_cv_have_beginthread" >&6
- if test "$ac_cv_have_beginthread" = yes; then
- 	CFLAGS="$CFLAGS -Zmt"
--	cat >> confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define HAVE_BEGINTHREAD 1
--EOF
-+_ACEOF
- 
- #else
- #	AC_CHECK_FUNC(pthread_create, cf_result=yes, cf_result=no)
-@@ -4222,264 +11339,480 @@
- #	fi
- fi
- #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE))
--for ac_hdr in atheos/threads.h
-+
-+for ac_header in atheos/threads.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4230: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 4235 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4240: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
-+
- for ac_func in spawn_thread
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4269: 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
-+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 <<EOF
--#line 4274 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:4297: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
-+
- for ac_func in resume_thread
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4324: 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
-+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 <<EOF
--#line 4329 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:4352: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
- 
--echo $ac_n "checking for MouOpen""... $ac_c" 1>&6
--echo "configure:4378: checking for MouOpen" >&5
--if eval "test \"`echo '$''{'ac_cv_func_MouOpen'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for MouOpen" >&5
-+echo $ECHO_N "checking for MouOpen... $ECHO_C" >&6
-+if test "${ac_cv_func_MouOpen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 4383 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char MouOpen(); below.  */
--#include <assert.h>
-+    which can conflict with char MouOpen (); 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
- /* 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 MouOpen();
--
--int main() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char MouOpen ();
- /* 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_MouOpen) || defined (__stub___MouOpen)
- choke me
- #else
--MouOpen();
-+char (*f) () = MouOpen;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_MouOpen=yes"
-+int
-+main ()
-+{
-+return f != MouOpen;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_MouOpen=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_MouOpen=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_MouOpen=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'MouOpen`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
-+echo "$as_me:$LINENO: result: $ac_cv_func_MouOpen" >&5
-+echo "${ECHO_T}$ac_cv_func_MouOpen" >&6
-+if test $ac_cv_func_MouOpen = yes; then
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_MOUOPEN 1
--EOF
-+_ACEOF
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for _read_kbd""... $ac_c" 1>&6
--echo "configure:4429: checking for _read_kbd" >&5
--if eval "test \"`echo '$''{'ac_cv_func__read_kbd'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for _read_kbd" >&5
-+echo $ECHO_N "checking for _read_kbd... $ECHO_C" >&6
-+if test "${ac_cv_func__read_kbd+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 4434 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char _read_kbd(); below.  */
--#include <assert.h>
-+    which can conflict with char _read_kbd (); 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
- /* 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 _read_kbd();
--
--int main() {
--
-+   builtin and then its argument prototype would still apply.  */
-+char _read_kbd ();
- /* 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__read_kbd) || defined (__stub____read_kbd)
- choke me
- #else
--_read_kbd();
-+char (*f) () = _read_kbd;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func__read_kbd=yes"
-+int
-+main ()
-+{
-+return f != _read_kbd;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func__read_kbd=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func__read_kbd=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func__read_kbd=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--if eval "test \"`echo '$ac_cv_func_'_read_kbd`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  cat >> confdefs.h <<\EOF
-+echo "$as_me:$LINENO: result: $ac_cv_func__read_kbd" >&5
-+echo "${ECHO_T}$ac_cv_func__read_kbd" >&6
-+if test $ac_cv_func__read_kbd = yes; then
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_READ_KBD 1
--EOF
-+_ACEOF
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 
--echo $ac_n "checking for XFree for OS/2""... $ac_c" 1>&6
--echo "configure:4481: checking for XFree for OS/2" >&5
--if eval "test \"`echo '$''{'ac_cv_have_x2'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for XFree for OS/2" >&5
-+echo $ECHO_N "checking for XFree for OS/2... $ECHO_C" >&6
-+if test "${ac_cv_have_x2+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   CPPFLAGS_X="$CPPFLAGS"
- 	LIBS_X="$LIBS"
-@@ -4487,118 +11820,171 @@
- 	if test -n "$X11ROOT"; then
- 		CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include"
- 		LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc"
--		cat > conftest.$ac_ext <<EOF
--#line 4492 "configure"
--#include "confdefs.h"
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <pty.h>
--int main() {
-+int
-+main ()
-+{
- struct winsize win;ptioctl(1, TIOCGWINSZ, &win)
--; return 0; }
--EOF
--if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_x2=xf86_gcc
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_x2=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_x2=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		if test "$ac_cv_have_x2" = no; then
- 			LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86"
--			cat > conftest.$ac_ext <<EOF
--#line 4512 "configure"
--#include "confdefs.h"
-+			cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <pty.h>
--int main() {
-+int
-+main ()
-+{
- struct winsize win;ptioctl(1, TIOCGWINSZ, &win)
--; return 0; }
--EOF
--if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_x2=xf86
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_x2=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_x2=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		fi
- 	fi
- 	CPPFLAGS="$CPPFLAGS_X"
- 	LIBS="$LIBS_X"
- 
- fi
--
--echo "$ac_t""$ac_cv_have_x2" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_have_x2" >&5
-+echo "${ECHO_T}$ac_cv_have_x2" >&6
- if test "$ac_cv_have_x2" != no; then
- 	CPPFLAGS="$CPPFLAGS -I$X11ROOT/XFree86/include"
- 	LIBS="$LIBS -L$X11ROOT/XFree86/lib -l$ac_cv_have_x2"
--	cat >> confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define X2 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:4547: checking for dlopen in -ldl" >&5
--ac_lib_var=`echo dl'_'dlopen | 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 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
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4555 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:4566: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_dl_dlopen=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_dl_dlopen=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBDL 1
-+_ACEOF
- 
-   LIBS="-ldl $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 
- #ifdef HAVE_SSL
-+
- # Check whether --with-ssl or --without-ssl was given.
- if test "${with_ssl+set}" = set; then
-   withval="$with_ssl"
-   if test "$withval" = no; then disable_ssl=yes; else ssld="$withval"; fi
--fi
--
--echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6
--echo "configure:4602: checking for OpenSSL" >&5
-+fi;
-+echo "$as_me:$LINENO: checking for OpenSSL" >&5
-+echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
- CPPFLAGS_X="$CPPFLAGS"
- LIBS_X="$LIBS"
- cf_result=no
-@@ -4611,762 +11997,1651 @@
- 			else
- 				LIBS="-lssl -lcrypto $LIBS_X"
- 			fi
--			cat > conftest.$ac_ext <<EOF
--#line 4616 "configure"
--#include "confdefs.h"
-+			cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <openssl/ssl.h>
--int main() {
-+int
-+main ()
-+{
- OpenSSL_add_all_algorithms()
--; return 0; }
--EOF
--if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   cf_result=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  cf_result=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cf_result=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 			if test "$cf_result" != yes; then
--				cat > conftest.$ac_ext <<EOF
--#line 4635 "configure"
--#include "confdefs.h"
-+				cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <openssl/ssl.h>
--int main() {
-+int
-+main ()
-+{
- SSLeay_add_ssl_algorithms()
--; return 0; }
--EOF
--if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   cf_result=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  cf_result=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cf_result=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 			fi
- 		fi
- 	done
- 
- 	if test "$cf_result" != yes; then
- 		if test "$withval" = yes; then
--			{ echo "configure: error: "OpenSSL not found"" 1>&2; exit 1; }
-+			{ { echo "$as_me:$LINENO: error: \"OpenSSL not found\"" >&5
-+echo "$as_me: error: \"OpenSSL not found\"" >&2;}
-+   { (exit 1); exit 1; }; }
- 		fi
- 	        CPPFLAGS="$CPPFLAGS_X"
-         	LIBS="$LIBS_X"
- 	else
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define HAVE_SSL 1
--EOF
-+_ACEOF
- 
- 	fi
- fi
--echo "$ac_t""$cf_result" 1>&6
-+echo "$as_me:$LINENO: result: $cf_result" >&5
-+echo "${ECHO_T}$cf_result" >&6
- cf_have_ssl=$cf_result;
- #endif
- 
- cf_have_atheos=no
- 
- if test "$cf_use_graphics" = yes; then
--	cat >> confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define G 1
--EOF
-+_ACEOF
- 
- 
- #		OpenBSD needs it, but gcc-3.1 doens't work with it !!!
- #	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- #	LDFLAGS="$LDFLAGS -L/usr/local/lib"
--	echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
--echo "configure:4685: checking for inflate in -lz" >&5
--ac_lib_var=`echo z'_'inflate | 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 inflate in -lz" >&5
-+echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6
-+if test "${ac_cv_lib_z_inflate+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4693 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 inflate();
--
--int main() {
--inflate()
--; return 0; }
--EOF
--if { (eval echo configure:4704: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char inflate ();
-+int
-+main ()
-+{
-+inflate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_z_inflate=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_z_inflate=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-+echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6
-+if test $ac_cv_lib_z_inflate = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBZ 1
-+_ACEOF
- 
-   LIBS="-lz $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
--	for ac_hdr in png.h libpng/png.h
-+
-+
-+for ac_header in png.h libpng/png.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4735: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 4740 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4745: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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 for png_create_info_struct in -lpng""... $ac_c" 1>&6
--echo "configure:4772: checking for png_create_info_struct in -lpng" >&5
--ac_lib_var=`echo png'_'png_create_info_struct | 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 png_create_info_struct in -lpng" >&5
-+echo $ECHO_N "checking for png_create_info_struct in -lpng... $ECHO_C" >&6
-+if test "${ac_cv_lib_png_png_create_info_struct+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpng  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4780 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 png_create_info_struct();
--
--int main() {
--png_create_info_struct()
--; return 0; }
--EOF
--if { (eval echo configure:4791: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char png_create_info_struct ();
-+int
-+main ()
-+{
-+png_create_info_struct ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_png_png_create_info_struct=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_png_png_create_info_struct=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_create_info_struct" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_create_info_struct" >&6
-+if test $ac_cv_lib_png_png_create_info_struct = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBPNG 1
-+_ACEOF
- 
-   LIBS="-lpng $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 	if test "$ac_cv_header_png_h" != yes && test "$ac_cv_header_libpng_png_h" != yes || test "$ac_cv_lib_png_png_create_info_struct" != yes; then
--		{ echo "configure: error: You need libpng to compile Links in graphics mode" 1>&2; exit 1; }
-+		{ { echo "$as_me:$LINENO: error: You need libpng to compile Links in graphics mode" >&5
-+echo "$as_me: error: You need libpng to compile Links in graphics mode" >&2;}
-+   { (exit 1); exit 1; }; }
- 	fi
- 
--	for ac_func in png_set_rgb_to_gray
-+
-+for ac_func in png_set_rgb_to_gray
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4825: 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
-+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 <<EOF
--#line 4830 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- /* 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
- /* 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();
--
--int main() {
--
-+   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
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:4853: \"$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"
-+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>&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 "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- done
- 
- 
--	echo $ac_n "checking if you can include both setjmp.h and png.h""... $ac_c" 1>&6
--echo "configure:4879: checking if you can include both setjmp.h and png.h" >&5
--if eval "test \"`echo '$''{'ac_cv_include_setjmp_png'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+	echo "$as_me:$LINENO: checking if you can include both setjmp.h and png.h" >&5
-+echo $ECHO_N "checking if you can include both setjmp.h and png.h... $ECHO_C" >&6
-+if test "${ac_cv_include_setjmp_png+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 4884 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <setjmp.h>
- 		#include <png.h>
--int main() {
-+int
-+main ()
-+{
- jmp_buf bla;
--; return 0; }
--EOF
--if { (eval echo configure:4892: \"$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>&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_include_setjmp_png=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_include_setjmp_png=no
--fi
--rm -f conftest*
--	
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_include_setjmp_png=no
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
- 
--echo "$ac_t""$ac_cv_include_setjmp_png" 1>&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_include_setjmp_png" >&5
-+echo "${ECHO_T}$ac_cv_include_setjmp_png" >&6
- 
- 	if test "$ac_cv_include_setjmp_png" != yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define DONT_INCLUDE_SETJMP 1
--EOF
-+_ACEOF
- 
- 	fi
- 
-+
- # Check whether --with-libjpeg or --without-libjpeg was given.
- if test "${with_libjpeg+set}" = set; then
-   withval="$with_libjpeg"
-   if test "$withval" = no; then disable_jpeg=yes; else disable_jpeg=no; fi
--fi
--
-+fi;
- 	cf_have_jpeg=no
- if test "$disable_jpeg" != yes ; then
--	for ac_hdr in jpeglib.h
-+
-+for ac_header in jpeglib.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4926: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 4931 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4936: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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 for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
--echo "configure:4963: checking for jpeg_destroy_decompress in -ljpeg" >&5
--ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | 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 jpeg_destroy_decompress in -ljpeg" >&5
-+echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6
-+if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-ljpeg  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4971 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 jpeg_destroy_decompress();
--
--int main() {
--jpeg_destroy_decompress()
--; return 0; }
--EOF
--if { (eval echo configure:4982: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char jpeg_destroy_decompress ();
-+int
-+main ()
-+{
-+jpeg_destroy_decompress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_jpeg_jpeg_destroy_decompress=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_jpeg_jpeg_destroy_decompress=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6
-+if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBJPEG 1
-+_ACEOF
- 
-   LIBS="-ljpeg $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 	if test "$ac_cv_header_jpeglib_h" = yes && test "$ac_cv_lib_jpeg_jpeg_destroy_decompress" = yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define HAVE_JPEG 1
--EOF
-+_ACEOF
- 
- 		cf_have_jpeg=yes
- 		image_formats="$image_formats JPEG"
- 	fi
- fi
- 
-+
- # Check whether --with-libtiff or --without-libtiff was given.
- if test "${with_libtiff+set}" = set; then
-   withval="$with_libtiff"
-   if test "$withval" = no; then disable_tiff=yes; else disable_tiff=no; fi
--fi
--
-+fi;
- 	cf_have_tiff=no
- if test "$disable_tiff" != yes ; then
--	for ac_hdr in tiffio.h
-+
-+for ac_header in tiffio.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5031: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5036 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5041: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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 for TIFFOpen in -ltiff""... $ac_c" 1>&6
--echo "configure:5068: checking for TIFFOpen in -ltiff" >&5
--ac_lib_var=`echo tiff'_'TIFFOpen | 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 TIFFOpen in -ltiff" >&5
-+echo $ECHO_N "checking for TIFFOpen in -ltiff... $ECHO_C" >&6
-+if test "${ac_cv_lib_tiff_TIFFOpen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltiff  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 5076 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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 TIFFOpen();
--
--int main() {
--TIFFOpen()
--; return 0; }
--EOF
--if { (eval echo configure:5087: \"$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"
-+   builtin and then its argument prototype would still apply.  */
-+char TIFFOpen ();
-+int
-+main ()
-+{
-+TIFFOpen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_tiff_TIFFOpen=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_tiff_TIFFOpen=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFOpen" >&6
-+if test $ac_cv_lib_tiff_TIFFOpen = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTIFF 1
-+_ACEOF
- 
-   LIBS="-ltiff $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 	if test "$ac_cv_header_tiffio_h" = yes && test "$ac_cv_lib_tiff_TIFFOpen" = yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define HAVE_TIFF 1
--EOF
-+_ACEOF
- 
- 		cf_have_tiff=yes
- 		image_formats="$image_formats TIFF"
- 	fi
- fi
- 
-+
- # Check whether --with-svgalib or --without-svgalib was given.
- if test "${with_svgalib+set}" = set; then
-   withval="$with_svgalib"
-   if test "$withval" = no; then disable_svgalib=yes; else disable_svgalib=no; fi
--fi
-+fi;
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-   withval="$with_x"
-   if test "$withval" = no; then disable_x=yes; else disable_x=no; fi
--fi
-+fi;
- 
- # Check whether --with-fb or --without-fb was given.
- if test "${with_fb+set}" = set; then
-   withval="$with_fb"
-   if test "$withval" = no; then disable_fb=yes; else disable_fb=no; fi
--fi
-+fi;
- 
- # Check whether --with-directfb or --without-directfb was given.
- if test "${with_directfb+set}" = set; then
-   withval="$with_directfb"
-   if test "$withval" = no; then disable_directfb=yes; else disable_directfb=no; fi
--fi
-+fi;
- 
- # Check whether --with-pmshell or --without-pmshell was given.
- if test "${with_pmshell+set}" = set; then
-   withval="$with_pmshell"
-   if test "$withval" = no; then disable_pmshell=yes; else disable_pmshell=no; fi
--fi
-+fi;
- 
- # Check whether --with-atheos or --without-atheos was given.
- if test "${with_atheos+set}" = set; then
-   withval="$with_atheos"
-   if test "$withval" = no; then disable_atheos=yes; else disable_atheos; fi
--fi
--
-+fi;
- 
- 	drivers=""
- 
- if test "$disable_svgalib" != yes ; then
--	echo $ac_n "checking for svgalib""... $ac_c" 1>&6
--echo "configure:5165: checking for svgalib" >&5
--if eval "test \"`echo '$''{'ac_cv_have_svgalib'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+	echo "$as_me:$LINENO: checking for svgalib" >&5
-+echo $ECHO_N "checking for svgalib... $ECHO_C" >&6
-+if test "${ac_cv_have_svgalib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   LIBS_X="$LIBS"
- 		LIBS="$LIBS -lvga"
--		cat > conftest.$ac_ext <<EOF
--#line 5172 "configure"
--#include "confdefs.h"
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #include <vga.h>
--int main() {
-+int
-+main ()
-+{
- vga_setmode(0)
--; return 0; }
--EOF
--if { (eval echo configure:5179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_svgalib=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_svgalib=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_svgalib=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$LIBS_X"
--	
--fi
- 
--echo "$ac_t""$ac_cv_have_svgalib" 1>&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_svgalib" >&5
-+echo "${ECHO_T}$ac_cv_have_svgalib" >&6
- 
- 	if test "$ac_cv_have_svgalib" = yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define GRDRV_SVGALIB 1
--EOF
-+_ACEOF
- 
- 		LIBS="$LIBS -lvga"
- 		drivers="$drivers SVGALIB"
- 	fi
- fi
- 
--	
-+
- if test "$disable_fb" != yes ; then
--	for ac_hdr in linux/fb.h
-+
-+for ac_header in linux/fb.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5211: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5216 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5221: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in linux/kd.h
-+
-+for ac_header in linux/kd.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5251: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5256 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5261: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in linux/vt.h
-+
-+for ac_header in linux/vt.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5291: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5296 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5301: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in sys/mman.h
-+
-+for ac_header in sys/mman.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5331: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5336 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5341: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
- 	if test "$ac_cv_header_linux_fb_h" = yes && test "$ac_cv_header_linux_kd_h" = yes && test "$ac_cv_header_linux_vt_h" = yes && test "$ac_cv_header_sys_mman_h" = yes && test "$ac_cv_header_sys_ioctl_h" = yes && test "$cf_have_gpm" = yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define GRDRV_FB 1
--EOF
-+_ACEOF
- 
- 		drivers="$drivers FB"
- 	fi
-@@ -5375,74 +13650,76 @@
- if test "$disable_directfb" != yes ; then
- 	# Extract the first word of "directfb-config", so it can be a program name with args.
- set dummy directfb-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5380: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_DIRECTFB_CONFIG'+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_path_DIRECTFB_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  case "$DIRECTFB_CONFIG" in
--  /*)
-+  case $DIRECTFB_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-   ac_cv_path_DIRECTFB_CONFIG="$DIRECTFB_CONFIG" # Let the user override the test with a path.
-   ;;
--  ?:/*)			 
--  ac_cv_path_DIRECTFB_CONFIG="$DIRECTFB_CONFIG" # Let the user override the test with a dos path.
--  ;;
-   *)
--  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_path_DIRECTFB_CONFIG="$ac_dir/$ac_word"
--      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_path_DIRECTFB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-   test -z "$ac_cv_path_DIRECTFB_CONFIG" && ac_cv_path_DIRECTFB_CONFIG="no"
-   ;;
- esac
- fi
--DIRECTFB_CONFIG="$ac_cv_path_DIRECTFB_CONFIG"
-+DIRECTFB_CONFIG=$ac_cv_path_DIRECTFB_CONFIG
-+
- if test -n "$DIRECTFB_CONFIG"; then
--  echo "$ac_t""$DIRECTFB_CONFIG" 1>&6
-+  echo "$as_me:$LINENO: result: $DIRECTFB_CONFIG" >&5
-+echo "${ECHO_T}$DIRECTFB_CONFIG" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
- 	if test "$DIRECTFB_CONFIG" != "no"; then
--	        echo $ac_n "checking for DirectFB >= 0.9.17""... $ac_c" 1>&6
--echo "configure:5415: checking for DirectFB >= 0.9.17" >&5
-+	        echo "$as_me:$LINENO: checking for DirectFB >= 0.9.17" >&5
-+echo $ECHO_N "checking for DirectFB >= 0.9.17... $ECHO_C" >&6
-         	directfb_version=`$DIRECTFB_CONFIG --version`
- 		if expr $directfb_version \>= 0.9.17 >/dev/null; then
--			echo "$ac_t""yes" 1>&6
-+			echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- 			DIRECTFB_CFLAGS=`$DIRECTFB_CONFIG --cflags`
- 			DIRECTFB_LIBS=`$DIRECTFB_CONFIG --libs`
--	           	cat >> confdefs.h <<\EOF
-+	           	cat >>confdefs.h <<\_ACEOF
- #define GRDRV_DIRECTFB 1
--EOF
-+_ACEOF
- 
-         	   	drivers="$drivers DIRECTFB"
- 			CPPFLAGS="$CPPFLAGS $DIRECTFB_CFLAGS"
- 			LIBS="$LIBS $DIRECTFB_LIBS"
- 		else
--			echo "$ac_t""no" 1>&6
-+			echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- 		fi
- 	fi
- 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:5439: checking for X" >&5
-+	echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6
-+
- 
- # 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.
-@@ -5452,193 +13729,184 @@
-     # 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
-+         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 Intrinsic.h.
-   # First, try using that file with no special directory specified.
--cat > conftest.$ac_ext <<EOF
--#line 5501 "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:5506: \"$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
-+#line $LINENO "configure"
-+/* 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
-+  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 5575 "configure"
--#include "confdefs.h"
--
--int main() {
--${x_direct_test_function}()
--; return 0; }
--EOF
--if { (eval echo configure:5582: \"$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
-+#line $LINENO "configure"
-+/* 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>&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.$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
-@@ -5647,12 +13915,14 @@
- 	        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.
-@@ -5661,111 +13931,234 @@
-   # 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
-+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
- 
- 	if test "$have_x" = yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define GRDRV_X 1
--EOF
-+_ACEOF
- 
- 		test -n "$x_libraries" && LIBS="$LIBS -L$x_libraries"
- 		LIBS="$LIBS -lX11"
- 		test -n "$x_includes" && CPPFLAGS="$CPPFLAGS -I$x_includes"
- 		drivers="$drivers X"
- 	elif test "$ac_cv_have_x2" != no; then
--		echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
--echo "configure:5680: 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 5688 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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; }
--EOF
--if { (eval echo configure:5699: \"$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"
-+   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>&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 "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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_X11_XOpenDisplay=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo X11 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
-+if test $ac_cv_lib_X11_XOpenDisplay = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBX11 1
-+_ACEOF
- 
-   LIBS="-lX11 $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
--		for ac_hdr in X11/Xlib.h X11/X.h X11/Xutil.h X11/Xlocale.h
-+
-+
-+
-+
-+for ac_header in X11/Xlib.h X11/X.h X11/Xutil.h X11/Xlocale.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5730: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5735 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5740: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
- 		if test "$ac_cv_have_libx11" = yes && test "$ac_cv_have_x11_xlib_h" = test && test "$ac_cv_have_x11_x_h" = test && test "$ac_cv_have_x11_xutil_h" = test && test "$ac_cv_have_x11_xlocale_h" = test; then
--			cat >> confdefs.h <<\EOF
-+			cat >>confdefs.h <<\_ACEOF
- #define GRDRV_X 1
--EOF
-+_ACEOF
- 
- 			drivers="$drivers X"
- 			LIBS="$LIBS -lX11"
-@@ -5773,43 +14166,61 @@
- 	fi
- 
- if test "$disable_pmshell" != yes ; then
--	echo $ac_n "checking for pmshell""... $ac_c" 1>&6
--echo "configure:5778: checking for pmshell" >&5
--if eval "test \"`echo '$''{'ac_cv_have_pmshell'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+	echo "$as_me:$LINENO: checking for pmshell" >&5
-+echo $ECHO_N "checking for pmshell... $ECHO_C" >&6
-+if test "${ac_cv_have_pmshell+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 5783 "configure"
--#include "confdefs.h"
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- #define INCL_WIN
- 			#define INCL_GPI
- 			#include <os2.h>
- 			#include <sys/fmutex.h>
--int main() {
-+int
-+main ()
-+{
- _fmutex mutex;
- 			WinDrawText(NULLHANDLE, -1, NULL, NULL, 0, 0, 0),
- 			GpiSetPel(NULLHANDLE, NULL)
--; return 0; }
--EOF
--if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-   ac_cv_have_pmshell=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_have_pmshell=no
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_pmshell=no
- fi
--rm -f conftest*
--	
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_have_pmshell" >&5
-+echo "${ECHO_T}$ac_cv_have_pmshell" >&6
- 
--echo "$ac_t""$ac_cv_have_pmshell" 1>&6
--			
- 	if test "$ac_cv_have_pmshell" = yes; then
--		cat >> confdefs.h <<\EOF
-+		cat >>confdefs.h <<\_ACEOF
- #define GRDRV_PMSHELL 1
--EOF
-+_ACEOF
- 
- 		drivers="$drivers PMSHELL"
- 	fi
-@@ -5818,244 +14229,856 @@
- if test "$disable_atheos" != yes ; then
- 	old_ext="$ac_ext"
- 	ac_ext=cpp
--	for ac_hdr in gui/view.h
-+
-+for ac_header in gui/view.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5826: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5831 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5836: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in gui/window.h
-+
-+for ac_header in gui/window.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5866: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5871 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5876: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in gui/desktop.h
-+
-+for ac_header in gui/desktop.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5906: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5911 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5916: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in gui/bitmap.h
-+
-+for ac_header in gui/bitmap.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5946: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5951 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5956: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in util/locker.h
-+
-+for ac_header in util/locker.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5986: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 5991 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5996: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
--	for ac_hdr in util/application.h
-+
-+for ac_header in util/application.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6026: 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
-+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
--  cat > conftest.$ac_ext <<EOF
--#line 6031 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6036: \"$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"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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 "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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
-+  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
-- 
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
-+  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 in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_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
- 
- 	ac_ext="$old_ext"
-@@ -6067,222 +15090,335 @@
- 	   test "$ac_cv_header_gui_bitmap_h" = yes &&
- 	   test "$ac_cv_header_util_locker_h" = yes &&
- 	   test "$ac_cv_header_util_application_h" = yes; then
--		echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6
--echo "configure:6072: checking for main in -lstdc++" >&5
--ac_lib_var=`echo stdc++'_'main | 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 main in -lstdc++" >&5
-+echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
-+if test "${ac_cv_lib_stdcpp_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-lstdc++  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 6080 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--int main() {
--main()
--; return 0; }
--EOF
--if { (eval echo configure:6087: \"$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"
-+
-+int
-+main ()
-+{
-+main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_stdcpp_main=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_stdcpp_main=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo stdc++ | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_stdcpp_main" >&6
-+if test $ac_cv_lib_stdcpp_main = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSTDC__ 1
-+_ACEOF
- 
-   LIBS="-lstdc++ $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
--		echo $ac_n "checking for main in -latheos""... $ac_c" 1>&6
--echo "configure:6115: checking for main in -latheos" >&5
--ac_lib_var=`echo atheos'_'main | 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 main in -latheos" >&5
-+echo $ECHO_N "checking for main in -latheos... $ECHO_C" >&6
-+if test "${ac_cv_lib_atheos_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_save_LIBS="$LIBS"
-+  ac_check_lib_save_LIBS=$LIBS
- LIBS="-latheos  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 6123 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--int main() {
--main()
--; return 0; }
--EOF
--if { (eval echo configure:6130: \"$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"
-+
-+int
-+main ()
-+{
-+main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_atheos_main=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"
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+ac_cv_lib_atheos_main=no
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo atheos | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_atheos_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_atheos_main" >&6
-+if test $ac_cv_lib_atheos_main = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBATHEOS 1
-+_ACEOF
- 
-   LIBS="-latheos $LIBS"
- 
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
- 		if test "$ac_cv_lib_atheos_main" = yes; then
--			for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
--do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:6163: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
-+			ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- 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"
-+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"
-+CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$ac_t""$CXX" 1>&6
-+  echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
- else
--  echo "$ac_t""no" 1>&6
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
--test -n "$CXX" && break
-+    test -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CXX="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
--test -n "$CXX" || CXX="gcc"
- 
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
- 
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:6195: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+  test -n "$ac_ct_CXX" && break
-+done
-+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
--ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
-+  CXX=$ac_ct_CXX
-+fi
- 
--cat > conftest.$ac_ext << EOF
- 
--#line 6206 "configure"
--#include "confdefs.h"
-+# 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); }
- 
--int main(){return(0);}
--EOF
--if { (eval echo configure:6211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  ac_cv_prog_cxx_works=yes
--  # If we can't run a trivial program, we are probably using a cross compiler.
--  if (./conftest; exit) 2>/dev/null; then
--    ac_cv_prog_cxx_cross=no
--  else
--    ac_cv_prog_cxx_cross=yes
--  fi
-+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
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  ac_cv_prog_cxx_works=no
--fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
--if test $ac_cv_prog_cxx_works = no; then
--  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:6237: 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
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
--echo "configure:6242: checking whether we are using GNU C++" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.C <<EOF
--#ifdef __GNUC__
--  yes;
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
- #endif
--EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
--  ac_cv_prog_gxx=yes
--else
--  ac_cv_prog_gxx=no
--fi
--fi
--
--echo "$ac_t""$ac_cv_prog_gxx" 1>&6
- 
--if test $ac_cv_prog_gxx = yes; then
--  GXX=yes
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_compiler_gnu=yes
- else
--  GXX=
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
--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:6270: 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
-+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
--  echo 'void f(){}' > conftest.cc
--if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$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"
-@@ -6296,10 +15432,206 @@
-     CXXFLAGS=
-   fi
- fi
-+for ac_declaration in \
-+   ''\
-+   '#include <stdlib.h>' \
-+   'extern "C" void std::exit (int) throw (); using std::exit;' \
-+   'extern "C" void std::exit (int); using std::exit;' \
-+   'extern "C" void exit (int) throw ();' \
-+   'extern "C" void exit (int);' \
-+   'void exit (int);'
-+do
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.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>&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
- 
--			cat >> confdefs.h <<\EOF
-+continue
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* 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>&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.$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
-+
-+depcc="$CXX"  am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      : > sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored.
-+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+			cat >>confdefs.h <<\_ACEOF
- #define GRDRV_ATHEOS 1
--EOF
-+_ACEOF
- 
- 			drivers="$drivers ATHEOS"
- 			cf_have_atheos=yes
-@@ -6308,7 +15640,9 @@
- fi
- 
- 	if test -z "$drivers" && test "$cf_use_graphics" = yes; then
--		{ echo "configure: error: No graphics drivers found." 1>&2; exit 1; }
-+		{ { echo "$as_me:$LINENO: error: No graphics drivers found." >&5
-+echo "$as_me: error: No graphics drivers found." >&2;}
-+   { (exit 1); exit 1; }; }
- 	fi
- fi
- 
-@@ -6322,380 +15656,1345 @@
-   ATHEOS_GR_FALSE=
- fi
- 
-+
- test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe"
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
- 
--trap '' 1 2 15
--cat > confcache <<\EOF
-+          ac_config_files="$ac_config_files Makefile"
-+
-+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
-+
-+
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${ATHEOS_GR_TRUE}" && test -z "${ATHEOS_GR_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"ATHEOS_GR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"ATHEOS_GR\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+: ${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
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/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
--  case "\$ac_option" in
--  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
--    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
--  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
--    echo "$CONFIG_STATUS generated by autoconf version 2.13"
--    exit 0 ;;
--  -help | --help | --hel | --he | --h)
--    echo "\$ac_cs_usage"; exit 0 ;;
--  *) echo "\$ac_cs_usage"; exit 1 ;;
--  esac
-+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    $as_unset $as_var
-+  fi
- done
- 
--ac_given_srcdir=$srcdir
--ac_given_INSTALL="$INSTALL"
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
- 
--trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
--EOF
--cat >> $CONFIG_STATUS <<EOF
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
- 
--# 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%@CPP@%$CPP%g
--s%@LIBOBJS@%$LIBOBJS%g
--s%@DIRECTFB_CONFIG@%$DIRECTFB_CONFIG%g
--s%@CXX@%$CXX%g
--s%@ATHEOS_GR_TRUE@%$ATHEOS_GR_TRUE%g
--s%@ATHEOS_GR_FALSE@%$ATHEOS_GR_FALSE%g
- 
--CEOF
--EOF
-+# 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'`
- 
--cat >> $CONFIG_STATUS <<\EOF
- 
--# Split the substitutions into bite-sized pieces for seds with
--# small command number limits, like on Digital OSF/1 and HP-UX.
--ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
--ac_file=1 # Number of current file.
--ac_beg=1 # First line for current file.
--ac_end=$ac_max_sed_cmds # Line after last line for current file.
--ac_more_lines=:
--ac_sed_cmds=""
--while $ac_more_lines; do
--  if test $ac_beg -gt 1; then
--    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+# 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
--    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+    PATH_SEPARATOR=:
-   fi
--  if test ! -s conftest.s$ac_file; then
--    ac_more_lines=false
--    rm -f conftest.s$ac_file
-+  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
--    if test -z "$ac_sed_cmds"; then
--      ac_sed_cmds="sed -f conftest.s$ac_file"
--    else
--      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
--    fi
--    ac_file=`expr $ac_file + 1`
--    ac_beg=$ac_end
--    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+    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
-+  as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" 	$as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+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.57.  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.57,
-+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+srcdir=$srcdir
-+INSTALL="$INSTALL"
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value.  By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+    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)
-+    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
--if test -z "$ac_sed_cmds"; then
--  ac_sed_cmds=cat
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
- fi
--EOF
- 
--cat >> $CONFIG_STATUS <<EOF
-+_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
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
--       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
--  *) ac_file_in="${ac_file}.in" ;;
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+#
-+# INIT-COMMANDS section.
-+#
-+
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+_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" ;;
-+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+  "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
- 
--  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-+# 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
- 
--  # 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=
-+# 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,@CYGPATH_W@,$CYGPATH_W,;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,@AMTAR@,$AMTAR,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@AWK@,$AWK,;t t
-+s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;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,@DEPDIR@,$DEPDIR,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-+s,@CXX@,$CXX,;t t
-+s,@CXXFLAGS@,$CXXFLAGS,;t t
-+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-+s,@CPP@,$CPP,;t t
-+s,@EGREP@,$EGREP,;t t
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@DIRECTFB_CONFIG@,$DIRECTFB_CONFIG,;t t
-+s,@ATHEOS_GR_TRUE@,$ATHEOS_GR_TRUE,;t t
-+s,@ATHEOS_GR_FALSE@,$ATHEOS_GR_FALSE,;t t
-+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-+CEOF
-+
-+_ACEOF
-+
-+  cat >>$CONFIG_STATUS <<\_ACEOF
-+  # Split the substitutions into bite-sized pieces for seds with
-+  # small command number limits, like on Digital OSF/1 and HP-UX.
-+  ac_max_sed_lines=48
-+  ac_sed_frag=1 # Number of current file.
-+  ac_beg=1 # First line for current file.
-+  ac_end=$ac_max_sed_lines # Line after last line for current file.
-+  ac_more_lines=:
-+  ac_sed_cmds=
-+  while $ac_more_lines; do
-+    if test $ac_beg -gt 1; then
-+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+    else
-+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+    fi
-+    if test ! -s $tmp/subs.frag; then
-+      ac_more_lines=false
-+    else
-+      # The purpose of the label and of the branching condition is to
-+      # speed up the sed processing (if there are no `@' at all, there
-+      # is no need to browse any of the substitutions).
-+      # These are the two extra sed commands mentioned above.
-+      (echo ':t
-+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+      if test -z "$ac_sed_cmds"; then
-+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+      else
-+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+      fi
-+      ac_sed_frag=`expr $ac_sed_frag + 1`
-+      ac_beg=$ac_end
-+      ac_end=`expr $ac_end + $ac_max_sed_lines`
-+    fi
-+  done
-+  if test -z "$ac_sed_cmds"; then
-+    ac_sed_cmds=cat
-   fi
-+fi # test -n "$CONFIG_FILES"
- 
--  case "$ac_given_srcdir" in
--  .)  srcdir=.
--      if test -z "$ac_dots"; then top_srcdir=.
--      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
--  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
--  *) # Relative path.
--    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
--    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+_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
-+  - | *:- | *:-:* ) # 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
- 
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
-+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X"$ac_file" : 'X\(//\)[^/]' \| \
-+         X"$ac_file" : 'X\(//\)$' \| \
-+         X"$ac_file" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  { 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; }; }; }
- 
--  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= ;;
-+  ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  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*
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-+  # Let's still pretend it is `configure' which instantiates (i.e., don't
-+  # use $as_me), people would be surprised to read:
-+  #    /* config.h.  Generated by config.status.  */
-+  if test x"$ac_file" = x-; then
-+    configure_input=
-+  else
-+    configure_input="$ac_file.  "
-+  fi
-+  configure_input=$configure_input"Generated from `echo $ac_file_in |
-+                                     sed 's,.*/,,'` by configure."
-+
-+  # First look for the input files in the build tree, otherwise in the
-+  # src tree.
-+  ac_file_inputs=`IFS=:
-+    for f in $ac_file_in; do
-+      case $f in
-+      -) echo $tmp/stdin ;;
-+      [\\/$]*)
-+         # Absolute (can't be DOS-style, as IFS=:)
-+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+   { (exit 1); exit 1; }; }
-+         echo $f;;
-+      *) # Relative
-+         if test -f "$f"; then
-+           # Build tree
-+           echo $f
-+         elif test -f "$srcdir/$f"; then
-+           # Source tree
-+           echo $srcdir/$f
-+         else
-+           # /dev/null tree
-+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+   { (exit 1); exit 1; }; }
-+         fi;;
-+      esac
-+    done` || { (exit 1); exit 1; }
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s,@configure_input@,$configure_input,;t t
-+s,@srcdir@,$ac_srcdir,;t t
-+s,@abs_srcdir@,$ac_abs_srcdir,;t t
-+s,@top_srcdir@,$ac_top_srcdir,;t t
-+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-+s,@builddir@,$ac_builddir,;t t
-+s,@abs_builddir@,$ac_abs_builddir,;t t
-+s,@top_builddir@,$ac_top_builddir,;t t
-+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-+s,@INSTALL@,$ac_INSTALL,;t t
-+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-+  rm -f $tmp/stdin
-+  if test x"$ac_file" != x-; then
-+    mv $tmp/out $ac_file
-+  else
-+    cat $tmp/out
-+    rm -f $tmp/out
-+  fi
-+
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+#
-+# 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'
-+ac_uD=',;t'
- 
--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
-+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
-+  # First look for the input files in the build tree, otherwise in the
-+  # src tree.
-+  ac_file_inputs=`IFS=:
-+    for f in $ac_file_in; do
-+      case $f in
-+      -) echo $tmp/stdin ;;
-+      [\\/$]*)
-+         # Absolute (can't be DOS-style, as IFS=:)
-+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+   { (exit 1); exit 1; }; }
-+         echo $f;;
-+      *) # Relative
-+         if test -f "$f"; then
-+           # Build tree
-+           echo $f
-+         elif test -f "$srcdir/$f"; then
-+           # Source tree
-+           echo $srcdir/$f
-+         else
-+           # /dev/null tree
-+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+   { (exit 1); exit 1; }; }
-+         fi;;
-+      esac
-+    done` || { (exit 1); exit 1; }
-+  # Remove the trailing spaces.
-+  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
- 
--EOF
-+_ACEOF
- 
--# 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
-+# 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
-+cat >>conftest.undefs <<\_ACEOF
-+s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+_ACEOF
- 
--# Break up conftest.vals because some shells have a limit on
--# the size of here documents, and old seds have small limits too.
-+# Break up conftest.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 grep . conftest.defines >/dev/null
-+do
-+  # Write a limited-size here document to $tmp/defines.sed.
-+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-+  # Speed up: don't consider the non `#define' lines.
-+  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
-+  # Work around the forget-to-reset-the-flag bug.
-+  echo 't clr' >>$CONFIG_STATUS
-+  echo ': clr' >>$CONFIG_STATUS
-+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+  echo 'CEOF
-+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-+  rm -f $tmp/in
-+  mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+  rm -f conftest.defines
-+  mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines
-+echo '  fi # 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 :
-+while grep . conftest.undefs >/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/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 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
-+  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.vals
-+rm -f conftest.undefs
- 
--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
-+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
--    # 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"
-+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-+  fi
-+  cat $tmp/in >>$tmp/config.h
-+  rm -f $tmp/in
-+  if test x"$ac_file" != x-; then
-+    if 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; }; }; }
-+
-+      rm -f $ac_file
-+      mv $tmp/config.h $ac_file
-     fi
--    rm -f $ac_file
--    mv conftest.h $ac_file
-+  else
-+    cat $tmp/config.h
-+    rm -f $tmp/config.h
-   fi
--fi; done
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $ac_file | $ac_file:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $ac_file" >`(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'`/stamp-h$_am_stamp_count
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
--EOF
--cat >> $CONFIG_STATUS <<EOF
-+#
-+# CONFIG_COMMANDS section.
-+#
-+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X"$ac_dest" : 'X\(//\)[^/]' \| \
-+         X"$ac_dest" : 'X\(//\)$' \| \
-+         X"$ac_dest" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X"$ac_dest" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  ac_builddir=.
- 
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
- 
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
--exit 0
--EOF
-+
-+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-+echo "$as_me: executing $ac_dest commands" >&6;}
-+  case $ac_dest in
-+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`(dirname "$mf") 2>/dev/null ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X"$mf" : 'X\(//\)[^/]' \| \
-+         X"$mf" : 'X\(//\)$' \| \
-+         X"$mf" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  else
-+    continue
-+  fi
-+  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-+  # Extract the definition of DEP_FILES from the Makefile without
-+  # running `make'.
-+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n -e '/^U = / s///p' < "$mf"`
-+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-+  # We invoke sed twice because it is the simplest approach to
-+  # changing $(DEPDIR) to its actual value in the expansion.
-+  for file in `sed -n -e '
-+    /^DEP_FILES = .*\\\\$/ {
-+      s/^DEP_FILES = //
-+      :loop
-+	s/\\\\$//
-+	p
-+	n
-+	/\\\\$/ b loop
-+      p
-+    }
-+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`(dirname "$file") 2>/dev/null ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X"$file" : 'X\(//\)[^/]' \| \
-+         X"$file" : 'X\(//\)$' \| \
-+         X"$file" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X"$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 $dirpart/$fdir
-+  else
-+    as_dir=$dirpart/$fdir
-+    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 $dirpart/$fdir" >&5
-+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+ ;;
-+  esac
-+done
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+{ (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
- 
- 
- echo "---------------------------------------------------------"
-@@ -6704,7 +17003,7 @@
- if test "$cf_have_gpm" = yes; then echo "GPM support:		YES"; else echo "GPM support:		NO"; fi
- if test "$cf_have_ssl" = yes; then echo "SSL support:		YES"; else echo "SSL support:		NO"; fi
- if test "$cf_use_javascript" = yes; then echo "Javascript enabled:	YES"; else echo "Javascript enabled:	NO"; fi
--if test "$cf_use_graphics" = yes; then 
-+if test "$cf_use_graphics" = yes; then
- 	echo "Graphics enabled:	YES"
- 	echo "Graphics drivers:	`echo $drivers|sed 's/^ //'`"
- 	echo "Image formats:		$image_formats"
-@@ -6718,5 +17017,5 @@
- #rm Makefile.tmp
- 
- #if test -z "$AWK"; then
--#	AC_WARN([awk not found. You won't be able to rebuild code page table.]);
-+#	AC_MSG_WARN([awk not found. You won't be able to rebuild code page table.]);
- #fi
diff --git a/packages/links/links-2.1pre14/configure.patch b/packages/links/links-2.1pre14/configure.patch
deleted file mode 100644
index 9752378977..0000000000
--- a/packages/links/links-2.1pre14/configure.patch
+++ /dev/null
@@ -1,258 +0,0 @@
---- links-2.1pre14/configure.in~configure
-+++ links-2.1pre14/configure.in
-@@ -3,7 +3,8 @@
- #          Martin 'PerM' Pergel
- # This file is a part of the Links program, released under GPL.
- 
--AC_INIT(main.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([main.c])
- 
- AM_INIT_AUTOMAKE(links, 2.1pre14)
- 
-@@ -13,12 +14,12 @@
- AUTOHEADER="./missing autoheader"
- image_formats="GIF PNG XBM"
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- dnl Checks for programs.
- AC_PROG_CC
- 
--#AC_PROG_CXX
-+AC_PROG_CXX
- #AC_PROG_AWK
- #AM_PROG_LEX
- #AC_PROG_YACC
-@@ -27,20 +28,20 @@
- #AC_CHECK_LIB(fl,main,AC_DEFINE(JS) LIBS="$LIBS -lfl",AC_MSG_WARN(You don't have libfl; you won't be able to run javascript))
- 
- AC_CACHE_CHECK([for EMX], ac_cv_have_emx,
--	AC_TRY_COMPILE(, [#ifndef __EMX__
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#ifndef __EMX__
- 	kill me!
--	#endif ], ac_cv_have_emx=yes, ac_cv_have_emx=no)
-+	#endif ]])],[ac_cv_have_emx=yes],[ac_cv_have_emx=no])
- )
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g" | sed "s/-Zbin-files//g"`
- 
- AC_CACHE_CHECK([for typeof], ac_cv_have_typeof,
--	AC_TRY_COMPILE(, [int a;
--	typeof(a) b;], ac_cv_have_typeof=yes, ac_cv_have_typeof=no)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a;
-+	typeof(a) b;]])],[ac_cv_have_typeof=yes],[ac_cv_have_typeof=no])
- 	)
- test "$ac_cv_have_typeof" = yes && AC_DEFINE(HAVE_TYPEOF)
- 
- AC_CACHE_CHECK([for long long], ac_cv_have_long_long,
--	AC_TRY_COMPILE(, [unsigned long long a; ], ac_cv_have_long_long=yes, ac_cv_have_long_long=no)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[unsigned long long a; ]])],[ac_cv_have_long_long=yes],[ac_cv_have_long_long=no])
- )
- test "$ac_cv_have_long_long" = yes && AC_DEFINE(HAVE_LONG_LONG)
- 
-@@ -87,7 +88,7 @@
- AC_CHECK_SIZEOF(long, "$default_int")
- AC_CHECK_SIZEOF(unsigned long, "$default_int")
- AC_CACHE_CHECK([for big endian], ac_cv_big_endian,
--	AC_TRY_RUN([
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	long l;
- 	char *c = (char *)&l;
- 	int main()
-@@ -95,10 +96,10 @@
- 		l = 0x12345678L;
- 		return !(c[[sizeof(long) - 1]] == 0x78 && c[[sizeof(long) - 2]] == 0x56 && c[[sizeof(long) - 3]] == 0x34 && c[[sizeof(long) - 4]] == 0x12);
- 	}
--	], ac_cv_big_endian=yes, ac_cv_big_endian=no, ac_cv_big_endian=no)
-+	]])],[ac_cv_big_endian=yes],[ac_cv_big_endian=no],[ac_cv_big_endian=no])
- )
- AC_CACHE_CHECK([for little endian], ac_cv_little_endian,
--	AC_TRY_RUN([
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	long l;
- 	char *c = (char *)&l;
- 	int main()
-@@ -106,9 +107,12 @@
- 		l = 0x12345678L;
- 		return !(c[[0]] == 0x78 && c[[1]] == 0x56 && c[[2]] == 0x34 && c[[3]] == 0x12);
- 	}
--	], ac_cv_little_endian=yes, ac_cv_little_endian=no, ac_cv_little_endian="$ac_cv_have_emx")
-+	]])],[ac_cv_little_endian=yes],[ac_cv_little_endian=no],[ac_cv_little_endian="$ac_cv_have_emx"])
- )
- 
-+AC_DEFUN([AC_BIG_ENDIAN],[],[])
-+AC_DEFUN([AC_LITTLE_ENDIAN],[],[])
-+
- if test "$ac_cv_big_endian" = yes; then
- 	AC_DEFINE(AC_BIG_ENDIAN)
- else if test "$ac_cv_little_endian" = yes; then
-@@ -122,19 +126,19 @@
- AC_TYPE_SIGNAL
- AC_FUNC_STRFTIME
- AC_FUNC_VPRINTF
--AC_HAVE_FUNCS(calloc)
--AC_HAVE_FUNCS(snprintf)
--AC_HAVE_FUNCS(gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod)
--AC_HAVE_FUNCS(getpid setpgid getpgid setpgrp getpgrp)
--AC_HAVE_FUNCS(popen)
--AC_HAVE_FUNCS(uname)
--AC_HAVE_FUNCS(strptime)
--AC_HAVE_FUNCS(setlocale)
--AC_HAVE_FUNCS(nl_langinfo)
--dnl AC_HAVE_FUNCS(sigsetjmp siglongjmp)
-+AC_CHECK_FUNCS([calloc])
-+AC_CHECK_FUNCS([snprintf])
-+AC_CHECK_FUNCS([gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod])
-+AC_CHECK_FUNCS([getpid setpgid getpgid setpgrp getpgrp])
-+AC_CHECK_FUNCS([popen])
-+AC_CHECK_FUNCS([uname])
-+AC_CHECK_FUNCS([strptime])
-+AC_CHECK_FUNCS([setlocale])
-+AC_CHECK_FUNCS([nl_langinfo])
-+dnl AC_CHECK_FUNCS([sigsetjmp siglongjmp])
- 
- AC_CACHE_CHECK([for sigsetjmp/siglongjmp], ac_cv_have_sigsetjmp,
--	AC_TRY_LINK([#include <setjmp.h>], [sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);], ac_cv_have_sigsetjmp=yes, ac_cv_have_sigsetjmp=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]], [[sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);]])],[ac_cv_have_sigsetjmp=yes],[ac_cv_have_sigsetjmp=no])
- )
- if test "$ac_cv_have_sigsetjmp" = yes; then
- 	AC_DEFINE(HAVE_SIGSETJMP)
-@@ -153,7 +157,7 @@
- fi
- 
- #AC_MSG_CHECKING([for gethostbyname])
--#AC_TRY_LINK([#include <netdb.h>], [gethostbyname("")], cf_result=yes, cf_result=no)
-+#AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[gethostbyname("")]])],[cf_result=yes],[cf_result=no])
- #AC_MSG_RESULT($cf_result)
- AC_CHECK_FUNC(gethostbyname, cf_result=yes, cf_result=no)
- if test "$cf_result" = no; then
-@@ -168,7 +172,7 @@
- AC_CHECK_FUNC(herror, AC_DEFINE(HAVE_HERROR))
- AC_CHECK_FUNC(cfmakeraw, AC_DEFINE(HAVE_CFMAKERAW))
- 
--AC_HAVE_FUNCS(cygwin_conv_to_full_win32_path)
-+AC_CHECK_FUNCS([cygwin_conv_to_full_win32_path])
- 
- AC_MSG_CHECKING([if you want to enable javascript])
- AC_ARG_ENABLE(javascript, [  --enable-javascript     use javascript interpreter], cf_use_javascript=yes, cf_use_javascript=no)
-@@ -192,7 +196,7 @@
- AC_CACHE_CHECK([for OS/2 threads], ac_cv_have_beginthread,
- 	CFLAGS_X="$CFLAGS"
- 	CFLAGS="$CFLAGS -Zmt"
--	AC_TRY_LINK([#include <stdlib.h>], [_beginthread(NULL, NULL, 0, NULL)], ac_cv_have_beginthread=yes, ac_cv_have_beginthread=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]], [[_beginthread(NULL, NULL, 0, NULL)]])],[ac_cv_have_beginthread=yes],[ac_cv_have_beginthread=no])
- 	CFLAGS="$CFLAGS_X"
- )
- if test "$ac_cv_have_beginthread" = yes; then
-@@ -209,8 +213,8 @@
- fi
- #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE))
- AC_CHECK_HEADERS(atheos/threads.h)
--AC_HAVE_FUNCS(spawn_thread)
--AC_HAVE_FUNCS(resume_thread)
-+AC_CHECK_FUNCS([spawn_thread])
-+AC_CHECK_FUNCS([resume_thread])
- 
- AC_CHECK_FUNC(MouOpen, AC_DEFINE(HAVE_MOUOPEN))
- AC_CHECK_FUNC(_read_kbd, AC_DEFINE(HAVE_READ_KBD))
-@@ -222,10 +226,10 @@
- 	if test -n "$X11ROOT"; then
- 		CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include"
- 		LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc"
--		AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86_gcc, ac_cv_have_x2=no)
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86_gcc],[ac_cv_have_x2=no])
- 		if test "$ac_cv_have_x2" = no; then
- 			LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86"
--			AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86, ac_cv_have_x2=no)
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86],[ac_cv_have_x2=no])
- 		fi
- 	fi
- 	CPPFLAGS="$CPPFLAGS_X"
-@@ -254,9 +258,9 @@
- 			else
- 				LIBS="-lssl -lcrypto $LIBS_X"
- 			fi
--			AC_TRY_LINK([#include <openssl/ssl.h>], [OpenSSL_add_all_algorithms()], cf_result=yes, cf_result=no)
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[OpenSSL_add_all_algorithms()]])],[cf_result=yes],[cf_result=no])
- 			if test "$cf_result" != yes; then
--				AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=yes, cf_result=no)
-+				AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
- 			fi
- 		fi
- 	done
-@@ -287,14 +291,14 @@
- 	AC_CHECK_HEADERS(png.h libpng/png.h)
- 	AC_CHECK_LIB(png, png_create_info_struct)
- 	if test "$ac_cv_header_png_h" != yes && test "$ac_cv_header_libpng_png_h" != yes || test "$ac_cv_lib_png_png_create_info_struct" != yes; then
--		AC_ERROR([You need libpng to compile Links in graphics mode])
-+		AC_MSG_ERROR([You need libpng to compile Links in graphics mode])
- 	fi
- 
--	AC_HAVE_FUNCS(png_set_rgb_to_gray)
-+	AC_CHECK_FUNCS([png_set_rgb_to_gray])
- 
- 	AC_CACHE_CHECK(if you can include both setjmp.h and png.h, ac_cv_include_setjmp_png,
--		AC_TRY_COMPILE([#include <setjmp.h>
--		#include <png.h>], [jmp_buf bla;], ac_cv_include_setjmp_png=yes, ac_cv_include_setjmp_png=no)
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>
-+		#include <png.h>]], [[jmp_buf bla;]])],[ac_cv_include_setjmp_png=yes],[ac_cv_include_setjmp_png=no])
- 	)
- 
- 	if test "$ac_cv_include_setjmp_png" != yes; then
-@@ -338,7 +342,7 @@
- 	AC_CACHE_CHECK([for svgalib], ac_cv_have_svgalib,
- 		LIBS_X="$LIBS"
- 		LIBS="$LIBS -lvga"
--		AC_TRY_LINK([#include <vga.h>], [vga_setmode(0)], ac_cv_have_svgalib=yes, ac_cv_have_svgalib=no)
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <vga.h>]], [[vga_setmode(0)]])],[ac_cv_have_svgalib=yes],[ac_cv_have_svgalib=no])
- 		LIBS="$LIBS_X"
- 	)
- 
-@@ -351,9 +355,9 @@
- 
- dnl		braine, tohle jsem predelal
- dnl 	AC_CACHE_CHECK([for framebuffer], ac_cv_have_fb,
--dnl 		AC_TRY_RUN([#include <stdio.h>
-+dnl 		AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- dnl 		#include <fcntl.h>
--dnl 		main(){return open("/dev/fb",O_RDWR)==-1;}], ac_cv_have_fb=yes, ac_cv_have_fb=no, ac_cv_have_fb=no)
-+dnl 		main(){return open("/dev/fb",O_RDWR)==-1;}]])],[ac_cv_have_fb=yes],[ac_cv_have_fb=no],[ac_cv_have_fb=no])
- dnl 	)
- 	
- if test "$disable_fb" != yes ; then
-@@ -406,14 +410,12 @@
- 
- if test "$disable_pmshell" != yes ; then
- 	AC_CACHE_CHECK([for pmshell], ac_cv_have_pmshell,
--		AC_TRY_LINK([#define INCL_WIN
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define INCL_WIN
- 			#define INCL_GPI
- 			#include <os2.h>
--			#include <sys/fmutex.h>],
--			[_fmutex mutex;
-+			#include <sys/fmutex.h>]], [[_fmutex mutex;
- 			WinDrawText(NULLHANDLE, -1, NULL, NULL, 0, 0, 0),
--			GpiSetPel(NULLHANDLE, NULL)],
--		ac_cv_have_pmshell=yes, ac_cv_have_pmshell=no)
-+			GpiSetPel(NULLHANDLE, NULL)]])],[ac_cv_have_pmshell=yes],[ac_cv_have_pmshell=no])
- 	)
- 			
- 	if test "$ac_cv_have_pmshell" = yes; then
-@@ -463,7 +465,8 @@
- test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe"
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
- 
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- echo "---------------------------------------------------------"
- echo "Configuration results:"
-@@ -485,5 +488,5 @@
- #rm Makefile.tmp
- 
- #if test -z "$AWK"; then
--#	AC_WARN([awk not found. You won't be able to rebuild code page table.]);
-+#	AC_MSG_WARN([awk not found. You won't be able to rebuild code page table.]);
- #fi
diff --git a/packages/links/links-x11_2.1pre21.bb b/packages/links/links-x11_2.1pre21.bb
deleted file mode 100644
index 4323b2e59a..0000000000
--- a/packages/links/links-x11_2.1pre21.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/network"
-DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-RCONFLICTS = "links"
-
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
-	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
-	        --without-libtiff --without-svgalib --without-fb \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --with-x --without-gpm --without-sdl"
-
-S = "${WORKDIR}/links-${PV}"
diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb
index 4323b2e59a..9c9bb831aa 100644
--- a/packages/links/links-x11_2.1pre22.bb
+++ b/packages/links/links-x11_2.1pre22.bb
@@ -8,7 +8,11 @@ RCONFLICTS = "links"
 MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 
 SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1"
+           file://ac-prog-cxx.patch;patch=1 \
+           file://cookies-save-0.96.patch;patch=1 \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/links/links_2.1pre12.bb b/packages/links/links_2.1pre12.bb
deleted file mode 100644
index 8ab27c6c31..0000000000
--- a/packages/links/links_2.1pre12.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/network"
-DEPENDS = "jpeg libpng gpm flex openssl zlib"
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
-	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
-	        --without-libtiff --without-svgalib --without-x --with-fb \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x"
diff --git a/packages/links/links_2.1pre14.bb b/packages/links/links_2.1pre14.bb
deleted file mode 100644
index a852456ba8..0000000000
--- a/packages/links/links_2.1pre14.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/network"
-DEPENDS = "jpeg libpng gpm flex openssl zlib"
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
-	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
-	        --without-libtiff --without-svgalib --with-fb \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x"
diff --git a/packages/links/links_2.1pre21.bb b/packages/links/links_2.1pre21.bb
deleted file mode 100644
index e0a991e148..0000000000
--- a/packages/links/links_2.1pre21.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/network"
-DEPENDS = "jpeg libpng gpm flex openssl zlib"
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-RCONFLICTS="links-x11"
-
-MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
-	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
-	        --without-libtiff --without-svgalib --with-fb \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x --without-sdl"
diff --git a/packages/links/links_2.1pre22.bb b/packages/links/links_2.1pre22.bb
index e0a991e148..faed366594 100644
--- a/packages/links/links_2.1pre22.bb
+++ b/packages/links/links_2.1pre22.bb
@@ -8,7 +8,11 @@ RCONFLICTS="links-x11"
 MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 
 SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1"
+           file://ac-prog-cxx.patch;patch=1 \
+           file://cookies-save-0.96.patch;patch=1 \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty b/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/h4000/defconfig b/packages/linux/handhelds-pxa-2.6/h4000/defconfig
new file mode 100644
index 0000000000..2bba0377eb
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6/h4000/defconfig
@@ -0,0 +1,1343 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-hh2
+# Sat Jun 24 13:09:54 2006
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+# CONFIG_MINIMAL_OOPS is not set
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_USELIB=y
+CONFIG_CORE_DUMP=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+CONFIG_OBSOLETE_INTERMODULE=m
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_L7200 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_ESERIES is not set
+# CONFIG_MACH_A620 is not set
+# CONFIG_MACH_A716 is not set
+# CONFIG_ARCH_H1900 is not set
+# CONFIG_ARCH_H2200 is not set
+# CONFIG_ARCH_H3900 is not set
+CONFIG_MACH_H4000=y
+CONFIG_IPAQ_H4000_SERIAL=m
+CONFIG_IPAQ_H4000_UDC=y
+CONFIG_IPAQ_H4000_LCD=y
+CONFIG_IPAQ_H4000_TS=y
+CONFIG_IPAQ_H4000_PCMCIA=y
+CONFIG_IPAQ_H4000_BUTTONS=y
+CONFIG_IPAQ_H4000_BATT=y
+CONFIG_IPAQ_H4300_KBD=m
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_HX2750 is not set
+# CONFIG_ARCH_H5400 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_HTCAPACHE is not set
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_MACH_X30 is not set
+# CONFIG_ARCH_ROVERP1 is not set
+# CONFIG_ARCH_ROVERP5P is not set
+# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_T3XSCALE is not set
+# CONFIG_PXA_SHARPSL is not set
+CONFIG_PXA25x=y
+# CONFIG_SA1100_H3100 is not set
+# CONFIG_SA1100_H3600 is not set
+# CONFIG_SA1100_H3800 is not set
+
+#
+# Linux As Bootloader
+#
+# CONFIG_LAB is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+CONFIG_XSCALE_PMU=y
+CONFIG_KEXEC=y
+
+#
+# Compaq/iPAQ Platforms
+#
+CONFIG_PXA_IPAQ=y
+
+#
+# XScale-based iPAQ
+#
+CONFIG_IPAQ_HANDHELD=y
+
+#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_IPAQ_SAMCOP is not set
+# CONFIG_IPAQ_HAMCOP is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_DEBUG=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+CONFIG_NO_IDLE_HZ=y
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="keepinitrd"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_PXA=y
+CONFIG_PXA25x_ALTERNATE_FREQS=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+CONFIG_PM_DEBUG=y
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_IPV6_TUNNEL is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_QUEUE is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=y
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=y
+CONFIG_IRCOMM=y
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+CONFIG_PXA_FICP=y
+CONFIG_BT=y
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+CONFIG_MTD_DEBUG=y
+CONFIG_MTD_DEBUG_VERBOSE=3
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=m
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+CONFIG_MTD_XIP=y
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
+# CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_HOSTAP is not set
+CONFIG_ACX=y
+CONFIG_ACX_MEM=y
+CONFIG_NET_WIRELESS=y
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_TSDEV=y
+CONFIG_INPUT_TSDEV_SCREEN_X=240
+CONFIG_INPUT_TSDEV_SCREEN_Y=320
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_PXA_COUNT=4
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ELV is not set
+CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA_SLAVE=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCA9535 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+CONFIG_SA1100_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+CONFIG_SPI_DEBUG=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+
+#
+# SPI Protocol Masters
+#
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# SoC drivers
+#
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_HTC_ASIC2 is not set
+CONFIG_HTC_ASIC3=y
+# CONFIG_SOC_TSC2101 is not set
+
+#
+# Misc devices
+#
+CONFIG_BATTERY_MONITOR=y
+
+#
+# Multimedia Capabilities Port drivers
+#
+# CONFIG_MCP is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_IMAGEON is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_DEVICE=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+# CONFIG_SND_A716 is not set
+# CONFIG_SND_H1910 is not set
+# CONFIG_SND_H2200 is not set
+# CONFIG_SND_HTCMAGICIAN is not set
+# CONFIG_SND_HX4700 is not set
+# CONFIG_SND_H5XXX_AK4535 is not set
+# CONFIG_SND_PXA2XX_AC97 is not set
+
+#
+# PCMCIA devices
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+CONFIG_USB_GADGET_PXA2XX=y
+CONFIG_USB_PXA2XX=y
+# CONFIG_USB_PXA2XX_SMALL is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_MQ11XX is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_CHAR is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_PXA is not set
+# CONFIG_MMC_TMIO is not set
+# CONFIG_MMC_SAMCOP is not set
+CONFIG_MMC_ASIC3=y
+
+#
+# LED devices
+#
+CONFIG_CLASS_LEDS=y
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=1
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=y
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+CONFIG_NLS_CODEPAGE_1250=y
+CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_VM=y
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_WAITQ is not set
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_LL is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb
new file mode 100644
index 0000000000..a5cc4073e4
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb
@@ -0,0 +1,67 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
+LICENSE = "GPL"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)'
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+	file://defconfig"
+
+S = "${WORKDIR}/kernel26"
+
+inherit kernel
+
+FILES_kernel-image_ipaq-pxa270 = ""
+ALLOW_EMPTY_ipaq_pxa270 = 1
+FILES_kernel-image_htcuniversal = ""
+ALLOW_EMPTY_htcuniversal = 1
+
+
+
+K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+HHV     = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
+
+do_configure() {
+
+	if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
+		die "-hh version mismatch"
+	fi
+
+	rm -f ${S}/.config
+
+	if [ ! -e ${WORKDIR}/defconfig ]; then
+		die "No default configuration for ${MACHINE} available."
+	fi
+
+
+	if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+		echo "CONFIG_AEABI=y"                   >> ${S}/.config
+		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
+	else
+		echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+		echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+	fi
+
+	sed 	-e '/CONFIG_AEABI/d' \
+		-e '/CONFIG_OABI_COMPAT=/d' \
+		'${WORKDIR}/defconfig' >>'${S}/.config'
+
+	yes '' | oe_runmake oldconfig
+
+}
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+}   
+   
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 7dfcb4d237..75f4425638 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -27,8 +27,8 @@ ALLOW_EMPTY_htcuniversal = 1
 
 K_MAJOR = "2"
 K_MINOR = "6"
-K_MICRO = "16"
-HHV     = "5"
+K_MICRO = "17"
+HHV     = "0"
 #
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
diff --git a/packages/linux/linux-ezx/a780-leds-r0.patch b/packages/linux/linux-ezx/a780-leds-r0.patch
deleted file mode 100644
index 31fdfc635b..0000000000
--- a/packages/linux/linux-ezx/a780-leds-r0.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/drivers/leds/Kconfig~a780-leds-r0.patch	2006-06-05 18:05:32.000000000 +0200
-+++ linux-2.6.16/drivers/leds/Kconfig	2006-06-05 18:05:32.000000000 +0200
-@@ -66,6 +66,13 @@
- 	  This options enables support for the LEDs on the
- 	  Motorola E680(i) GSM Phone.
- 
-+config LEDS_A780
-+	tristate "LED Support for the Motorola A780 GSM Phone"
-+	depends LEDS_CLASS && PXA_EZX_A780
-+	help
-+	  This option enables support for the LEDs on the
-+	  Motorola A780 GSM Phone.
-+
- config LEDS_TRIGGER_TIMER
- 	tristate "LED Timer Trigger"
- 	depends LEDS_TRIGGERS
---- linux-2.6.16/drivers/leds/Makefile~a780-leds-r0.patch	2006-06-05 18:05:32.000000000 +0200
-+++ linux-2.6.16/drivers/leds/Makefile	2006-06-05 18:05:32.000000000 +0200
-@@ -11,6 +11,7 @@
- obj-$(CONFIG_LEDS_IXP4XX)		+= leds-ixp4xx-gpio.o
- obj-$(CONFIG_LEDS_TOSA)			+= leds-tosa.o
- obj-$(CONFIG_LEDS_E680)		+= leds-e680.o
-+obj-$(CONFIG_LEDS_A780)		+= leds-a780.o
- 
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~a780-leds-r0.patch	2006-06-05 18:05:32.000000000 +0200
-+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2006-06-05 18:05:32.000000000 +0200
-@@ -367,6 +367,15 @@
- };
- #endif
- 
-+#ifdef CONFIG_PXA_EZX_A780
-+/*
-+ * A780 LEDs
-+ */
-+static struct platform_device a780led_device = {
-+	.name		= "a780-led",
-+	.id		= -1,
-+};
-+#endif
- 
- /* keyboard */
- 
-@@ -780,6 +789,9 @@
- #ifdef CONFIG_PXA_EZX_E680
- 	&e680led_device,
- #endif
-+#ifdef CONFIG_PXA_EZX_A780
-+	&a780led_device,
-+#endif
- };
- 
- static void __init
---- /dev/null	2006-06-05 13:59:28.329930680 +0200
-+++ linux-2.6.16/drivers/leds/leds-a780.c	2006-06-05 18:27:13.000000000 +0200
-@@ -0,0 +1,123 @@
-+/*
-+ * EZX Platform LED Driver for the Motorola A780 GSM Phone
-+ *
-+ * Copyright 2006 Vanille-Media
-+ *
-+ * Author: Michael Lauer <mickey@Vanille.de>
-+ *
-+ * Based on keylight.c by Motorola and leds-corgi.c by Richard Purdie
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/arch/ezx-pcap.h>
-+
-+static void a780led_main_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	if ( value > 31 ) value = 31;
-+	printk( KERN_DEBUG "a780led_main_set: %d\n", value );
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL0, value & 0x01);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL1, value & 0x02);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL2, value & 0x04);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL3, value & 0x08);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL4, value & 0x10);
-+}
-+
-+static void a780led_aux_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	if ( value > 31 ) value = 31;
-+	printk( KERN_DEBUG "a780led_aux_set: %d\n", value );
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL0, value & 0x01);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL1, value & 0x02);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL2, value & 0x04);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL3, value & 0x08);
-+	ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL4, value & 0x10);
-+}
-+
-+static struct led_classdev a780_main_led = {
-+	.name			= "a780:main",
-+	.default_trigger	= "none",
-+	.brightness_set		= a780led_main_set,
-+};
-+
-+static struct led_classdev a780_aux_led = {
-+	.name			= "a780:aux",
-+	.default_trigger	= "none",
-+	.brightness_set		= a780led_aux_set,
-+};
-+
-+#ifdef CONFIG_PM
-+static int a780led_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+	led_classdev_suspend(&a780_main_led);
-+	led_classdev_suspend(&a780_aux_led);
-+	return 0;
-+}
-+
-+static int a780led_resume(struct platform_device *dev)
-+{
-+	led_classdev_resume(&a780_main_led);
-+	led_classdev_resume(&a780_aux_led);
-+	return 0;
-+}
-+#endif
-+
-+static int a780led_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &a780_main_led);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &a780_aux_led);
-+	if (ret < 0)
-+		led_classdev_unregister(&a780_main_led);
-+
-+	return ret;
-+}
-+
-+static int a780led_remove(struct platform_device *pdev)
-+{
-+	led_classdev_unregister(&a780_main_led);
-+	led_classdev_unregister(&a780_aux_led);
-+	return 0;
-+}
-+
-+static struct platform_driver a780led_driver = {
-+	.probe		= a780led_probe,
-+	.remove		= a780led_remove,
-+#ifdef CONFIG_PM
-+	.suspend	= a780led_suspend,
-+	.resume		= a780led_resume,
-+#endif
-+	.driver		= {
-+		.name		= "a780-led",
-+	},
-+};
-+
-+static int __init a780led_init(void)
-+{
-+	return platform_driver_register(&a780led_driver);
-+}
-+
-+static void __exit a780led_exit(void)
-+{
-+	a780led_main_set( &a780_main_led, 0 );
-+	a780led_aux_set( &a780_aux_led, 0 );
-+	platform_driver_unregister(&a780led_driver);
-+}
-+
-+module_init(a780led_init);
-+module_exit(a780led_exit);
-+
-+MODULE_AUTHOR("Michael Lauer <mickey@Vanille.de>");
-+MODULE_DESCRIPTION("Motorola A780 LED driver");
-+MODULE_LICENSE("GPL");
diff --git a/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch b/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch
deleted file mode 100644
index a0d953ddfb..0000000000
--- a/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/drivers/i2c/chips/Makefile~e680-disable-boomer	2006-05-31 18:52:44.000000000 +0200
-+++ linux-2.6.16/drivers/i2c/chips/Makefile	2006-05-31 18:56:38.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- obj-$(CONFIG_I2C_ADCM2700)	+= e680_camera.o
- obj-$(CONFIG_I2C_A780_CAMERA)	+= a780_camera.o
--obj-$(CONFIG_PXA_EZX_E680)	+= boomer.o
-+//obj-$(CONFIG_PXA_EZX_E680)	+= boomer.o
- 
- ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
diff --git a/packages/linux/linux-ezx/e680-fix-keypad.patch b/packages/linux/linux-ezx/e680-fix-keypad.patch
deleted file mode 100644
index ca06052803..0000000000
--- a/packages/linux/linux-ezx/e680-fix-keypad.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-fix-keypad.patch	2006-06-11 00:47:33.000000000 +0200
-+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2006-06-12 16:13:28.000000000 +0200
-@@ -341,71 +341,25 @@
- };
- #endif
- 
--/* keyboard */
--
--#if defined(CONFIG_PXA_EZX_V700)
--#error "kbd matrix still needs to be converted to new row/col layout"
--static unsigned char ezx_keycode[] = {
--	/* col 0 */
--	KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
--	KEYPAD_POUND, KEY_0, KEY_9, 0,
--	/* col 1 */
--	KEY_2, KEY_4, KEY_6, KEY_8,
--	KEY_7, KEYPAD_SLEFT, KEYPAD_SRIGHT, 0,
--	/* col 2 */
--	KEY_MENU, KEY_1, KEY_3, KEY_5,
--	KEY_KPASTERISK, KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0,
--	/* col 3 */
--	KEY_CAMERA, KEYPAD_CLEAR, KEYPAD_CARRIER, KEYPAD_ACTIVATE,
--	KEYPAD_SEND, KEYPAD_SMART, KEYPAD_VAVR, 0,
--};
--static unsigned char ezx_direct_keycode[] = {
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--};
--#elif defined(CONFIG_PXA_EZX_E680_P4A)
--#error "kbd matrix still needs to be converted to new row/col layout"
--static unsigned char ezx_keycode[] = {
--	/* col 0 */
--	KEY_UP, KEY_DOWN, KEY_LEFT, 0, 0, 0, 0, 0,
--	/* col 1 */
--	KEY_RIGHT, KEY_CENTER, KEY_HOME, 0, 0, 0, 0, 0,
--	/* col 2 */
--	KEYPAD_GAME_R, 0, KEYPAD_GAME_L, 0, 0, 0, 0, 0,
--	/* col 3 */
--	KEY_A, KEY_B, 0, 0, 0, 0, 0, 0,
--};
--static unsigned char ezx_direct_keycode[] = {
--	KEY_CAMERA,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEY_POWER,
--	KEYPAD_NONE,
--};
--#elif defined(CONFIG_PXA_EZX_E680)
--#error "kbd matrix still needs to be converted to new row/col layout"
-+/*
-+ * PXA Keyboard
-+ */
-+#if defined(CONFIG_PXA_EZX_E680)
- static unsigned char ezx_keycode[] = {
--	/* col 0 */
--	KEY_UP, KEY_DOWN, 0, 0, 0, 0, 0, 0,
--	/* col 1 */
--	KEY_RIGHT, KEY_LEFT, 0, 0, 0, 0, 0, 0,
--	/* col 2 */
--	0, KEYPAD_GAME_R, 0, 0, 0, 0, 0, 0,
--	/* col 3 */
--	KEYPAD_HOME, KEYPAD_GAME_L, KEYPAD_CENTER, 0, 0, 0, 0, 0,
-+	/* row 0 */
-+	KEY_UP, KEY_RIGHT, KEY_RESERVED, KEY_PHONE,
-+	/* row 1 */
-+	KEY_DOWN, KEY_LEFT, KEY_VOLUMEUP, KEY_VOLUMEDOWN,
-+	/* row 2 */
-+	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_KPENTER,
- };
- static unsigned char ezx_direct_keycode[] = {
- 	KEY_CAMERA,
--	KEYPAD_NONE,
--	KEYPAD_NONE,
--	KEYPAD_A,
-+	KEY_RESERVED,
-+	KEY_RESERVED,
-+	KEY_HOME,
- 	KEY_POWER,
--	KEYPAD_B,
-+	KEY_MENU,
- };
- #elif defined(CONFIG_PXA_EZX_A780)
- static unsigned char ezx_keycode[] = {
-@@ -424,22 +378,12 @@
- 	KEY_CAMERA,
- };
- #else
--#error "no EZX subarchitecture defined !?!"
-+#error "no EZX subarchitecture defined"
- #endif
- 
- static int ezx_kbd_init(void)
- {
--#if defined(CONFIG_PXA_EZX_E680_P4A)
--	pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN);  /* KP_DKIN<0>, VR Key */
--	pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN);  /* KP_DKIN<4>, power key */
--	pxa_gpio_mode(100 | GPIO_ALT_FN_1_IN);  /* KP_MKIN<0> */
--	pxa_gpio_mode(101 | GPIO_ALT_FN_1_IN);  /* KP_MKIN<1> */
--	pxa_gpio_mode(102 | GPIO_ALT_FN_1_IN);  /* KP_MKIN<2> */
--	pxa_gpio_mode(103 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<0> */
--	pxa_gpio_mode(104 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<1> */
--	pxa_gpio_mode(105 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<2> */
--	pxa_gpio_mode(106 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<3> */
--#elif defined(CONFIG_PXA_EZX_E680)
-+#if defined(CONFIG_PXA_EZX_E680)
- 	pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN);  /* KP_DKIN<0>, VR Key */
- 	pxa_gpio_mode(96 | GPIO_ALT_FN_1_IN);  /* KP_DKIN<3>, GAME_A */
- 	pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN);  /* KP_DKIN<4>, power key */
-@@ -455,7 +399,7 @@
- 	GPDR(GPIO_TC_MM_EN)   |= GPIO_bit(GPIO_TC_MM_EN);
- 	GPSR(GPIO_TC_MM_EN)   = GPIO_bit(GPIO_TC_MM_EN);
- 	PGSR3 |= GPIO_bit(GPIO_TC_MM_EN);
--#elif defined (CONFIG_PXA_EZX_A780)
-+#elif defined(CONFIG_PXA_EZX_A780)
- 	pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN);   /* KP_DKIN<0>, voice_rec */
- 	pxa_gpio_mode(97 | GPIO_ALT_FN_3_IN);   /* KP_MKIN<3> */
- 	pxa_gpio_mode(98 | GPIO_ALT_FN_3_IN);   /* KP_MKIN<4> */
-@@ -476,10 +420,7 @@
- 	.scan_interval	= HZ/40,
- 	.matrix		= {
- 		.keycode = &ezx_keycode,
--#if defined(CONFIG_ARCH_EXZ_E680_P4A)
--		.cols	= 4,
--		.rows	= 3,
--#elif defined(CONFIG_PXA_EZX_E680)
-+#if defined(CONFIG_PXA_EZX_E680)
- 		.cols	= 4,
- 		.rows 	= 3,
- #elif defined(CONFIG_PXA_EZX_A780)
-@@ -489,10 +430,8 @@
- 	},
- 	.direct		= {
- 		.keycode = &ezx_direct_keycode,
--#if defined(CONFIG_PXA_EZX_E680_P4A)
--		.num	= 4,
--#elif defined(CONFIG_PXA_EZX_E680)
--		.num	= 5,
-+#if defined(CONFIG_PXA_EZX_E680)
-+		.num	= 6,
- #elif defined(CONFIG_PXA_EZX_A780)
- 		.num	= 1,
- #endif
diff --git a/packages/linux/linux-ezx/e680-leds-r0.patch b/packages/linux/linux-ezx/e680-leds-r0.patch
deleted file mode 100644
index b6d2413dc1..0000000000
--- a/packages/linux/linux-ezx/e680-leds-r0.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~led_ezx-r0.patch	2006-06-03 15:17:43.000000000 +0200
-+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2006-06-05 15:14:59.000000000 +0200
-@@ -357,6 +357,17 @@
- 	.num_resources	= ARRAY_SIZE(ezx_backlight_resources),
- };
- 
-+#ifdef CONFIG_PXA_EZX_E680
-+/*
-+ * E680 LEDs
-+ */
-+static struct platform_device e680led_device = {
-+	.name		= "e680-led",
-+	.id		= -1,
-+};
-+#endif
-+
-+
- /* keyboard */
- 
- #if defined(CONFIG_PXA_EZX_V700)
-@@ -770,6 +781,9 @@
- 
- static struct platform_device *devices[] __initdata = {
- 	&ezx_bp_device,
-+#ifdef CONFIG_PXA_EZX_E680
-+	&e680led_device,
-+#endif
- };
- 
- static void __init
---- linux-2.6.16/drivers/leds/Kconfig~led_ezx-r0.patch	2006-06-03 15:17:47.000000000 +0200
-+++ linux-2.6.16/drivers/leds/Kconfig	2006-06-03 15:17:47.000000000 +0200
-@@ -59,6 +59,13 @@
- 	  This option enables support for the LEDs on Sharp Zaurus
- 	  SL-6000 series.
- 
-+config LEDS_E680
-+	tristate "LED Support for the Motorola E680(i) GSM Phone"
-+	depends LEDS_CLASS && PXA_EZX_E680
-+	help
-+	  This options enables support for the LEDs on the
-+	  Motorola E680(i) GSM Phone.
-+
- config LEDS_TRIGGER_TIMER
- 	tristate "LED Timer Trigger"
- 	depends LEDS_TRIGGERS
---- linux-2.6.16/drivers/leds/Makefile~led_ezx-r0.patch	2006-06-03 15:17:47.000000000 +0200
-+++ linux-2.6.16/drivers/leds/Makefile	2006-06-03 15:17:47.000000000 +0200
-@@ -10,7 +10,8 @@
- obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o
- obj-$(CONFIG_LEDS_IXP4XX)		+= leds-ixp4xx-gpio.o
- obj-$(CONFIG_LEDS_TOSA)			+= leds-tosa.o
-+obj-$(CONFIG_LEDS_E680)		+= leds-e680.o
- 
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
--obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
-\ Kein Zeilenumbruch am Dateiende.
-+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
---- /dev/null	2006-06-05 13:59:28.329930680 +0200
-+++ linux-2.6.16/drivers/leds/leds-e680.c	2006-06-05 15:11:42.000000000 +0200
-@@ -0,0 +1,269 @@
-+/*
-+ * EZX Platform LED Driver for the Motorola E680(i) GSM Phone
-+ *
-+ * Copyright 2006 Vanille-Media
-+ *
-+ * Author: Michael Lauer <mickey@Vanille.de>
-+ *
-+ * Based on the Motorola 2.4 leds-e680.c and leds-corgi.c by Richard Purdie
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/hardware.h>
-+#include <asm/arch/pxa-regs.h>
-+//FIXME this belongs to somewhere else, please
-+//      adjust when ssp_pcap.h reached its final destination
-+#include "../misc/ezx/ssp_pcap.h"
-+
-+//FIXME move defines to header file
-+#define IND_CNTL_R_BUL 46
-+#define IND_CNTL_G_BUL 47
-+#define SSP_PCAP_LED_MASK  0x000fffe0
-+#define SSP_PCAP_LED_SHIFT 5
-+
-+static enum led_brightness old_red;
-+static enum led_brightness old_green;
-+static enum led_brightness old_blue;
-+
-+typedef struct {
-+	unsigned char ind_GPIO_red;    /*Indicator Red control GPIO 46: 0 active, 1 disactive*/
-+	unsigned char ind_GPIO_green;  /*Indicator Green control GPIO 47: 0 active, 1 disactive*/
-+	unsigned char pcap_LEDR_en;    /*pcap LEDR_EN bit value: 1 =Red LED(&Green) sink circuit enabled*/
-+	unsigned char pcap_LEDG_en;    /*pcap LEDG_EN bit value:1 =Green(->Blue)LED sink circuit enabled*/
-+	unsigned char pcap_LEDR_CTRL; /* 4bits Sets the timing for the red(&Green) LED sink circuit*/
-+	unsigned char pcap_LEDG_CTRL; /* 4bits Sets the timing for the GREEN (->Blue) LED sink circuit*/
-+	unsigned char pcap_LEDR_I;   /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDR*/
-+	unsigned char pcap_LEDG_I;   /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDG*/
-+	unsigned char pcap_SKIP_on;  /*1=The ON timing sequence defined by LEDx_CTRL is executed on every other cycle*/
-+} PCAP2_LED_REGISTER_VALUE;
-+
-+const PCAP2_LED_REGISTER_VALUE led_register_value[]=
-+{
-+  /*  on/off pulsepower  timing  intensity */
-+	{0x1,0x1, 0x0,0x0, 0x0,0x0, 0x0,0x0,0x0}, /* OFF */
-+	{0x0,0x1, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* RED */
-+	{0x1,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* GREEN */
-+	{0x0,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* ORANGE = RED + GREEN */
-+	{0x1,0x1, 0x0,0x1, 0x0,0xc, 0x0,0x0,0x0}, /* BLUE */
-+	{0x0,0x1, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_RED = RED + BLUE */
-+	{0x1,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_GREEN = GREEN + BLUE */
-+	{0x0,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* WHITE = RED + GREEN + BLUE */
-+};
-+
-+static void e680led_led_set( enum led_brightness red, enum led_brightness green, enum led_brightness blue )
-+{
-+	printk( KERN_DEBUG "e680led_led_set: red=%d, green=%d, blue=%d", red, green, blue );
-+	unsigned int tempValue = 0;
-+	unsigned int value = 0;
-+	unsigned int stateIndex = 0;
-+	unsigned char gpio_red, gpio_green, ledr_en, ledg_en, ledr_ctrl, ledg_ctrl, ledr_i, ledg_i,skip;
-+
-+	stateIndex = ( ( blue << 2 ) | ( green << 1 ) | ( red ) )   & 0x7;
-+	printk( KERN_DEBUG "LED stateIndex is %d", stateIndex );
-+	gpio_red   = led_register_value[stateIndex].ind_GPIO_red    & 0x1;
-+	gpio_green = led_register_value[stateIndex].ind_GPIO_green  & 0x1;
-+	ledr_en    = led_register_value[stateIndex].pcap_LEDR_en    & 0x1;
-+	ledg_en    = led_register_value[stateIndex].pcap_LEDG_en    & 0x1;
-+	ledr_ctrl  = led_register_value[stateIndex].pcap_LEDR_CTRL  & 0xf;
-+	ledg_ctrl  = led_register_value[stateIndex].pcap_LEDG_CTRL  & 0xf;
-+	ledr_i     = led_register_value[stateIndex].pcap_LEDR_I     & 0x3;
-+	ledg_i     = led_register_value[stateIndex].pcap_LEDG_I     & 0x3;
-+	skip       = led_register_value[stateIndex].pcap_SKIP_on    & 0x1;
-+
-+	/* disable LEDs */
-+	if( ezx_pcap_read(SSP_PCAP_ADJ_PERIPH_REGISTER,&tempValue) != SSP_PCAP_SUCCESS )
-+	{
-+		printk( KERN_WARNING "LED PCAP Read Failed\n" );
-+		return;
-+	}
-+	tempValue &= (~SSP_PCAP_LED_MASK);
-+	if( ezx_pcap_write(SSP_PCAP_ADJ_PERIPH_REGISTER,tempValue) != SSP_PCAP_SUCCESS )
-+	{
-+		printk( KERN_WARNING "LED PCAP Write Failed (Clear Data)\n" );
-+		return;
-+	}
-+	
-+	/* configure GPIOs as output */
-+	pxa_gpio_mode(IND_CNTL_R_BUL | GPIO_OUT);
-+	pxa_gpio_mode(IND_CNTL_G_BUL | GPIO_OUT);
-+
-+	//FIXME: Simplify this logic
-+	if ( (gpio_green && gpio_red) )
-+	{
-+		/*Disable Red & Green signal*/
-+		set_GPIO(IND_CNTL_R_BUL); /*IND_CNTL_R_BUL Low active*/
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL);
-+		
-+		clr_GPIO(IND_CNTL_G_BUL); /*IND_CNTL_G_BUL High active*/
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL));
-+		
-+		printk( KERN_DEBUG "LED GPIO Green & Red Disable\n");
-+	} else if ( gpio_green && !gpio_red )
-+	{
-+		/*Green Disable, Red Enable*/
-+		clr_GPIO(IND_CNTL_R_BUL);
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL));
-+		
-+		clr_GPIO(IND_CNTL_G_BUL);
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL));
-+	
-+		printk( KERN_DEBUG "LED GPIO Green Disable, Red Enable\n");
-+	} else if (gpio_red && !gpio_green )
-+	{
-+		/*Red Disable, Green Enable*/
-+		set_GPIO(IND_CNTL_R_BUL);
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL);
-+		
-+		set_GPIO(IND_CNTL_G_BUL);
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL);
-+		printk( KERN_DEBUG "LED GPIO Red Disable, Green Enable");
-+	}else
-+	{
-+		/*Red & Green enable*/
-+		clr_GPIO(IND_CNTL_R_BUL);
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL));
-+		
-+		set_GPIO(IND_CNTL_G_BUL);
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL);
-+		printk( KERN_DEBUG "LED GPIO Red & Green Enable\n");
-+	}
-+	
-+	/* Write PCAP LED Peripheral Control Register*/
-+	value = ( ledr_en | (ledg_en <<1) | (ledr_ctrl <<2) | (ledg_ctrl <<6) |
-+		(ledr_i << 10) | (ledg_i <<12) | (skip <<14) ) & 0x7fff;
-+	tempValue |= (value <<SSP_PCAP_LED_SHIFT);
-+	
-+	if ( ezx_pcap_write(SSP_PCAP_ADJ_PERIPH_REGISTER,tempValue) == SSP_PCAP_SUCCESS )
-+	{
-+		printk( KERN_DEBUG "LED PCAP Write Success (0x%x :0x%x)\n",tempValue,value);
-+		old_red = red;
-+		old_green = green;
-+		old_blue = blue;
-+		return;
-+	} else {
-+		printk( KERN_DEBUG "LED PCAP Write Failed (State Change)\n");
-+		return;
-+	}
-+}
-+
-+static void e680led_red_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	printk( KERN_DEBUG "e680led_red_set: %d\n", value );
-+	e680led_led_set( 1 && value, old_green, old_blue );
-+}
-+
-+static void e680led_green_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	printk( KERN_DEBUG "e680led_green_set: %d\n", value );
-+	e680led_led_set( old_red, 1 && value, old_blue );
-+}
-+
-+static void e680led_blue_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	printk( KERN_DEBUG "e680led_blue_set: %d\n", value );
-+	e680led_led_set( old_red, old_green, 1 && value );
-+}
-+
-+static struct led_classdev e680_red_led = {
-+	.name			= "e680:red",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_red_set,
-+};
-+
-+static struct led_classdev e680_green_led = {
-+	.name			= "e680:green",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_green_set,
-+};
-+
-+static struct led_classdev e680_blue_led = {
-+	.name			= "e680:blue",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_blue_set,
-+};
-+
-+#ifdef CONFIG_PM
-+static int e680led_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+	led_classdev_suspend(&e680_red_led);
-+	led_classdev_suspend(&e680_green_led);
-+	led_classdev_suspend(&e680_blue_led);
-+	return 0;
-+}
-+
-+static int e680led_resume(struct platform_device *dev)
-+{
-+	led_classdev_resume(&e680_red_led);
-+	led_classdev_resume(&e680_green_led);
-+	led_classdev_resume(&e680_blue_led);
-+	return 0;
-+}
-+#endif
-+
-+static int e680led_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &e680_red_led);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &e680_green_led);
-+	if (ret < 0)
-+		led_classdev_unregister(&e680_red_led);
-+
-+	ret = led_classdev_register(&pdev->dev, &e680_blue_led);
-+	if (ret < 0) {
-+		led_classdev_unregister(&e680_red_led);
-+		led_classdev_unregister(&e680_green_led);
-+	}
-+	return ret;
-+}
-+
-+static int e680led_remove(struct platform_device *pdev)
-+{
-+	led_classdev_unregister(&e680_red_led);
-+	led_classdev_unregister(&e680_green_led);
-+	led_classdev_unregister(&e680_blue_led);
-+	return 0;
-+}
-+
-+static struct platform_driver e680led_driver = {
-+	.probe		= e680led_probe,
-+	.remove		= e680led_remove,
-+#ifdef CONFIG_PM
-+	.suspend	= e680led_suspend,
-+	.resume		= e680led_resume,
-+#endif
-+	.driver		= {
-+		.name		= "e680-led",
-+	},
-+};
-+
-+static int __init e680led_init(void)
-+{
-+	return platform_driver_register(&e680led_driver);
-+}
-+
-+static void __exit e680led_exit(void)
-+{
-+	e680led_led_set( 0, 0, 0 );
-+	platform_driver_unregister(&e680led_driver);
-+}
-+
-+module_init(e680led_init);
-+module_exit(e680led_exit);
-+
-+MODULE_AUTHOR("Michael Lauer <mickey@Vanille.de>");
-+MODULE_DESCRIPTION("Motorola E680 LED driver");
-+MODULE_LICENSE("GPL");
diff --git a/packages/linux/linux-ezx/e680-leds-r1.patch b/packages/linux/linux-ezx/e680-leds-r1.patch
deleted file mode 100644
index abbab2937d..0000000000
--- a/packages/linux/linux-ezx/e680-leds-r1.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-leds-r0.patch	2006-06-06 17:14:06.000000000 +0200
-+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2006-06-06 17:23:14.000000000 +0200
-@@ -357,6 +357,17 @@
- 	.num_resources	= ARRAY_SIZE(ezx_backlight_resources),
- };
- 
-+#ifdef CONFIG_PXA_EZX_E680
-+/*
-+ * E680 LEDs
-+ */
-+static struct platform_device e680led_device = {
-+	.name		= "e680-led",
-+	.id		= -1,
-+};
-+#endif
-+
-+
- /* keyboard */
- 
- #if defined(CONFIG_PXA_EZX_V700)
-@@ -766,6 +777,9 @@
- 
- static struct platform_device *devices[] __initdata = {
- 	&ezx_bp_device,
-+#ifdef CONFIG_PXA_EZX_E680
-+	&e680led_device,
-+#endif
- };
- 
- static void __init
---- linux-2.6.16/drivers/leds/Kconfig~e680-leds-r0.patch	2006-06-06 17:14:05.000000000 +0200
-+++ linux-2.6.16/drivers/leds/Kconfig	2006-06-06 17:23:14.000000000 +0200
-@@ -59,6 +59,13 @@
- 	  This option enables support for the LEDs on Sharp Zaurus
- 	  SL-6000 series.
- 
-+config LEDS_E680
-+	tristate "LED Support for the Motorola E680(i) GSM Phone"
-+	depends LEDS_CLASS && PXA_EZX_E680
-+	help
-+	  This options enables support for the LEDs on the
-+	  Motorola E680(i) GSM Phone.
-+
- config LEDS_TRIGGER_TIMER
- 	tristate "LED Timer Trigger"
- 	depends LEDS_TRIGGERS
---- linux-2.6.16/drivers/leds/Makefile~e680-leds-r0.patch	2006-06-06 17:14:05.000000000 +0200
-+++ linux-2.6.16/drivers/leds/Makefile	2006-06-06 17:23:14.000000000 +0200
-@@ -10,7 +10,8 @@
- obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o
- obj-$(CONFIG_LEDS_IXP4XX)		+= leds-ixp4xx-gpio.o
- obj-$(CONFIG_LEDS_TOSA)			+= leds-tosa.o
-+obj-$(CONFIG_LEDS_E680)		+= leds-e680.o
- 
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
--obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
-\ Kein Zeilenumbruch am Dateiende.
-+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
---- /dev/null	2006-06-06 16:58:36.577045136 +0200
-+++ linux-2.6.16/drivers/leds/leds-e680.c	2006-06-06 17:55:46.000000000 +0200
-@@ -0,0 +1,307 @@
-+/*
-+ * EZX Platform LED Driver for the Motorola E680(i) GSM Phone
-+ *
-+ * Copyright 2006 Vanille-Media
-+ *
-+ * Author: Michael Lauer <mickey@Vanille.de>
-+ *
-+ * Based on the Motorola 2.4 leds-e680.c and leds-corgi.c by Richard Purdie
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/delay.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/hardware.h>
-+#include <asm/arch/pxa-regs.h>
-+#include <asm/arch/ezx-pcap.h>
-+
-+//FIXME move defines to a common header file
-+#define IND_CNTL_R_BUL     46
-+#define IND_CNTL_G_BUL     47
-+#define SSP_PCAP_LED_MASK  0x000fffe0
-+#define SSP_PCAP_LED_SHIFT 5
-+#define GPIO_TC_MM_EN      99
-+
-+static enum led_brightness old_red;
-+static enum led_brightness old_green;
-+static enum led_brightness old_blue;
-+
-+typedef struct {
-+	unsigned char ind_GPIO_red;    /*Indicator Red control GPIO 46: 0 active, 1 disactive*/
-+	unsigned char ind_GPIO_green;  /*Indicator Green control GPIO 47: 0 active, 1 disactive*/
-+	unsigned char pcap_LEDR_en;    /*pcap LEDR_EN bit value: 1 =Red LED(&Green) sink circuit enabled*/
-+	unsigned char pcap_LEDG_en;    /*pcap LEDG_EN bit value:1 =Green(->Blue)LED sink circuit enabled*/
-+	unsigned char pcap_LEDR_CTRL; /* 4bits Sets the timing for the red(&Green) LED sink circuit*/
-+	unsigned char pcap_LEDG_CTRL; /* 4bits Sets the timing for the GREEN (->Blue) LED sink circuit*/
-+	unsigned char pcap_LEDR_I;   /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDR*/
-+	unsigned char pcap_LEDG_I;   /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDG*/
-+	unsigned char pcap_SKIP_on;  /*1=The ON timing sequence defined by LEDx_CTRL is executed on every other cycle*/
-+} PCAP2_LED_REGISTER_VALUE;
-+
-+const PCAP2_LED_REGISTER_VALUE led_register_value[]=
-+{
-+  /*  on/off pulsepower  timing  intensity */
-+	{0x1,0x1, 0x0,0x0, 0x0,0x0, 0x0,0x0,0x0}, /* OFF */
-+	{0x0,0x1, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* RED */
-+	{0x1,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* GREEN */
-+	{0x0,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* ORANGE = RED + GREEN */
-+	{0x1,0x1, 0x0,0x1, 0x0,0xc, 0x0,0x0,0x0}, /* BLUE */
-+	{0x0,0x1, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_RED = RED + BLUE */
-+	{0x1,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_GREEN = GREEN + BLUE */
-+	{0x0,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* WHITE = RED + GREEN + BLUE */
-+};
-+
-+static void e680led_led_set( enum led_brightness red, enum led_brightness green, enum led_brightness blue )
-+{
-+	printk( KERN_DEBUG "e680led_led_set: red=%d, green=%d, blue=%d", red, green, blue );
-+	unsigned int tempValue = 0;
-+	unsigned int value = 0;
-+	unsigned int stateIndex = 0;
-+	unsigned char gpio_red, gpio_green, ledr_en, ledg_en, ledr_ctrl, ledg_ctrl, ledr_i, ledg_i,skip;
-+
-+	stateIndex = ( ( blue << 2 ) | ( green << 1 ) | ( red ) )   & 0x7;
-+	printk( KERN_DEBUG "LED stateIndex is %d", stateIndex );
-+	gpio_red   = led_register_value[stateIndex].ind_GPIO_red    & 0x1;
-+	gpio_green = led_register_value[stateIndex].ind_GPIO_green  & 0x1;
-+	ledr_en    = led_register_value[stateIndex].pcap_LEDR_en    & 0x1;
-+	ledg_en    = led_register_value[stateIndex].pcap_LEDG_en    & 0x1;
-+	ledr_ctrl  = led_register_value[stateIndex].pcap_LEDR_CTRL  & 0xf;
-+	ledg_ctrl  = led_register_value[stateIndex].pcap_LEDG_CTRL  & 0xf;
-+	ledr_i     = led_register_value[stateIndex].pcap_LEDR_I     & 0x3;
-+	ledg_i     = led_register_value[stateIndex].pcap_LEDG_I     & 0x3;
-+	skip       = led_register_value[stateIndex].pcap_SKIP_on    & 0x1;
-+
-+	/* disable LEDs */
-+	if( ezx_pcap_read(SSP_PCAP_ADJ_PERIPH_REGISTER,&tempValue) != SSP_PCAP_SUCCESS )
-+	{
-+		printk( KERN_WARNING "LED PCAP Read Failed\n" );
-+		return;
-+	}
-+	tempValue &= (~SSP_PCAP_LED_MASK);
-+	if( ezx_pcap_write(SSP_PCAP_ADJ_PERIPH_REGISTER,tempValue) != SSP_PCAP_SUCCESS )
-+	{
-+		printk( KERN_WARNING "LED PCAP Write Failed (Clear Data)\n" );
-+		return;
-+	}
-+	
-+	/* configure GPIOs as output */
-+	pxa_gpio_mode(IND_CNTL_R_BUL | GPIO_OUT);
-+	pxa_gpio_mode(IND_CNTL_G_BUL | GPIO_OUT);
-+
-+	//FIXME: Simplify this logic
-+	if ( (gpio_green && gpio_red) )
-+	{
-+		/*Disable Red & Green signal*/
-+		set_GPIO(IND_CNTL_R_BUL); /*IND_CNTL_R_BUL Low active*/
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL);
-+		
-+		clr_GPIO(IND_CNTL_G_BUL); /*IND_CNTL_G_BUL High active*/
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL));
-+		
-+		printk( KERN_DEBUG "LED GPIO Green & Red Disable\n");
-+	} else if ( gpio_green && !gpio_red )
-+	{
-+		/*Green Disable, Red Enable*/
-+		clr_GPIO(IND_CNTL_R_BUL);
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL));
-+		
-+		clr_GPIO(IND_CNTL_G_BUL);
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL));
-+	
-+		printk( KERN_DEBUG "LED GPIO Green Disable, Red Enable\n");
-+	} else if (gpio_red && !gpio_green )
-+	{
-+		/*Red Disable, Green Enable*/
-+		set_GPIO(IND_CNTL_R_BUL);
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL);
-+		
-+		set_GPIO(IND_CNTL_G_BUL);
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL);
-+		printk( KERN_DEBUG "LED GPIO Red Disable, Green Enable");
-+	}else
-+	{
-+		/*Red & Green enable*/
-+		clr_GPIO(IND_CNTL_R_BUL);
-+		PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL));
-+		
-+		set_GPIO(IND_CNTL_G_BUL);
-+		PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL);
-+		printk( KERN_DEBUG "LED GPIO Red & Green Enable\n");
-+	}
-+	
-+	/* Write PCAP LED Peripheral Control Register*/
-+	value = ( ledr_en | (ledg_en <<1) | (ledr_ctrl <<2) | (ledg_ctrl <<6) |
-+		(ledr_i << 10) | (ledg_i <<12) | (skip <<14) ) & 0x7fff;
-+	tempValue |= (value <<SSP_PCAP_LED_SHIFT);
-+	
-+	if ( ezx_pcap_write(SSP_PCAP_ADJ_PERIPH_REGISTER,tempValue) == SSP_PCAP_SUCCESS )
-+	{
-+		printk( KERN_DEBUG "LED PCAP Write Success (0x%x :0x%x)\n",tempValue,value);
-+		old_red = red;
-+		old_green = green;
-+		old_blue = blue;
-+		return;
-+	} else {
-+		printk( KERN_DEBUG "LED PCAP Write Failed (State Change)\n");
-+		return;
-+	}
-+}
-+
-+static void e680led_red_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	printk( KERN_DEBUG "e680led_red_set: %d\n", value );
-+	e680led_led_set( 1 && value, old_green, old_blue );
-+}
-+
-+static void e680led_green_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	printk( KERN_DEBUG "e680led_green_set: %d\n", value );
-+	e680led_led_set( old_red, 1 && value, old_blue );
-+}
-+
-+static void e680led_blue_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	printk( KERN_DEBUG "e680led_blue_set: %d\n", value );
-+	e680led_led_set( old_red, old_green, 1 && value );
-+}
-+
-+static void e680led_keypad_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	/* this is not working yet, as there is something else missing */
-+#if 0
-+	printk( KERN_DEBUG "e680led_keypad_set: %d\n", value );
-+
-+	pxa_gpio_mode(GPIO_TC_MM_EN);
-+	GPDR(GPIO_TC_MM_EN)   |= GPIO_bit(GPIO_TC_MM_EN);
-+	GPSR(GPIO_TC_MM_EN)   = GPIO_bit(GPIO_TC_MM_EN);
-+
-+	udelay( 100 );
-+
-+    if ( value ) {
-+		GPCR(GPIO_TC_MM_EN)   = GPIO_bit(GPIO_TC_MM_EN);
-+		PGSR3 &= ~GPIO_bit(GPIO_TC_MM_EN);
-+    } else {
-+		GPSR(GPIO_TC_MM_EN)   = GPIO_bit(GPIO_TC_MM_EN);
-+		PGSR3 |= GPIO_bit(GPIO_TC_MM_EN);
-+    }
-+#endif
-+}
-+
-+static struct led_classdev e680_red_led = {
-+	.name			= "e680:red",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_red_set,
-+};
-+
-+static struct led_classdev e680_green_led = {
-+	.name			= "e680:green",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_green_set,
-+};
-+
-+static struct led_classdev e680_blue_led = {
-+	.name			= "e680:blue",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_blue_set,
-+};
-+
-+static struct led_classdev e680_keypad_led = {
-+	.name			= "e680:keypad",
-+	.default_trigger	= "none",
-+	.brightness_set		= e680led_keypad_set,
-+};
-+
-+#ifdef CONFIG_PM
-+static int e680led_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+	led_classdev_suspend(&e680_red_led);
-+	led_classdev_suspend(&e680_green_led);
-+	led_classdev_suspend(&e680_blue_led);
-+	led_classdev_suspend(&e680_keypad_led);
-+	return 0;
-+}
-+
-+static int e680led_resume(struct platform_device *dev)
-+{
-+	led_classdev_resume(&e680_red_led);
-+	led_classdev_resume(&e680_green_led);
-+	led_classdev_resume(&e680_blue_led);
-+	led_classdev_resume(&e680_keypad_led);
-+	return 0;
-+}
-+#endif
-+
-+static int e680led_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &e680_red_led);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &e680_green_led);
-+	if (ret < 0)
-+		led_classdev_unregister(&e680_red_led);
-+
-+	ret = led_classdev_register(&pdev->dev, &e680_blue_led);
-+	if (ret < 0) {
-+		led_classdev_unregister(&e680_red_led);
-+		led_classdev_unregister(&e680_green_led);
-+	}
-+	
-+	ret = led_classdev_register(&pdev->dev, &e680_keypad_led);
-+	if (ret < 0) {
-+		led_classdev_unregister(&e680_red_led);
-+		led_classdev_unregister(&e680_green_led);
-+		led_classdev_unregister(&e680_blue_led);
-+	}
-+	return ret;
-+}
-+
-+static int e680led_remove(struct platform_device *pdev)
-+{
-+	led_classdev_unregister(&e680_red_led);
-+	led_classdev_unregister(&e680_green_led);
-+	led_classdev_unregister(&e680_blue_led);
-+	led_classdev_unregister(&e680_keypad_led);
-+	return 0;
-+}
-+
-+static struct platform_driver e680led_driver = {
-+	.probe		= e680led_probe,
-+	.remove		= e680led_remove,
-+#ifdef CONFIG_PM
-+	.suspend	= e680led_suspend,
-+	.resume		= e680led_resume,
-+#endif
-+	.driver		= {
-+		.name		= "e680-led",
-+	},
-+};
-+
-+static int __init e680led_init(void)
-+{
-+	return platform_driver_register(&e680led_driver);
-+}
-+
-+static void __exit e680led_exit(void)
-+{
-+	e680led_led_set( 0, 0, 0 );
-+	platform_driver_unregister(&e680led_driver);
-+}
-+
-+module_init(e680led_init);
-+module_exit(e680led_exit);
-+
-+MODULE_AUTHOR("Michael Lauer <mickey@Vanille.de>");
-+MODULE_DESCRIPTION("Motorola E680 LED driver");
-+MODULE_LICENSE("GPL");
diff --git a/packages/linux/linux-ezx/ezx-backlight-r0.patch b/packages/linux/linux-ezx/ezx-backlight-r0.patch
deleted file mode 100644
index db917300c2..0000000000
--- a/packages/linux/linux-ezx/ezx-backlight-r0.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~ezx-backlight-r0.patch	2006-06-07 16:00:29.000000000 +0200
-+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2006-06-07 16:21:09.000000000 +0200
-@@ -344,17 +344,12 @@
- 	.pxafb_lcd_power	= &pxafb_lcd_power,
- };
- 
--
--/* backlight for lcd */
--
--static struct resource ezx_backlight_resources[] = {
--};
--
--static struct platform_device ezx_backlight_device = {
--	.name		= "ezx-lcd-backlight",
-+/*
-+ * EZX LCD Backlight
-+ */
-+static struct platform_device ezxbacklight_device = {
-+	.name		= "ezx-bl",
- 	.id		= -1,
--	.resource	= ezx_backlight_resources,
--	.num_resources	= ARRAY_SIZE(ezx_backlight_resources),
- };
- 
- #ifdef CONFIG_PXA_EZX_E680
-@@ -786,6 +781,7 @@
- 
- static struct platform_device *devices[] __initdata = {
- 	&ezx_bp_device,
-+	&ezxbacklight_device,
- #ifdef CONFIG_PXA_EZX_E680
- 	&e680led_device,
- #endif
---- linux-2.6.16/drivers/video/backlight/Kconfig~ezx-backlight-r0.patch	2006-06-07 16:00:28.000000000 +0200
-+++ linux-2.6.16/drivers/video/backlight/Kconfig	2006-06-07 16:00:30.000000000 +0200
-@@ -58,3 +58,12 @@
- 	  If you have a HP Jornada 680, say y to enable the
- 	  backlight driver.
- 
-+config BACKLIGHT_EZX
-+	tristate "Motorola EXZ Backlight Driver (A780/E680/E680i)"
-+	depends on BACKLIGHT_DEVICE && PXA_EZX
-+	default y
-+	help
-+	  If you have a Motorola A780 or E680(i), say y to enable the
-+	  backlight driver.
-+
-+
---- linux-2.6.16/drivers/video/backlight/Makefile~ezx-backlight-r0.patch	2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/drivers/video/backlight/Makefile	2006-06-07 16:00:30.000000000 +0200
-@@ -5,3 +5,5 @@
- obj-$(CONFIG_BACKLIGHT_CORGI)	+= corgi_bl.o
- obj-$(CONFIG_BACKLIGHT_HP680)	+= hp680_bl.o
- obj-$(CONFIG_SHARP_LOCOMO)	+= locomolcd.o
-+obj-$(CONFIG_BACKLIGHT_EZX)	+= ezx_bl.o
-+
---- /dev/null	2006-06-07 15:54:31.503752232 +0200
-+++ linux-2.6.16/drivers/video/backlight/ezx_bl.c	2006-06-07 16:51:14.000000000 +0200
-@@ -0,0 +1,148 @@
-+/*
-+ * Backlight Driver for Motorola A780 and E680(i) GSM Phones.
-+ *
-+ * Copyright 2006 Vanille Media
-+ *
-+ * Author: Michael Lauer <mickey@Vanille.de>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+
-+#include <asm/arch/pxa-regs.h>
-+#include <asm/arch/ezx.h>
-+
-+#define EZX_MAX_INTENSITY      50
-+#define EZX_DEFAULT_INTENSITY  25
-+
-+static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
-+static struct backlight_properties ezxbl_data;
-+static struct backlight_device *ezx_backlight_device;
-+static int current_intensity;
-+
-+static int ezx_send_intensity(struct backlight_device *bd)
-+{
-+	unsigned long flags;
-+	int intensity = bd->props->brightness;
-+
-+	printk( KERN_DEBUG "ezx_set_intensity to %d", intensity );
-+
-+	if (bd->props->power != FB_BLANK_UNBLANK)
-+		intensity = 0;
-+	if (bd->props->fb_blank != FB_BLANK_UNBLANK)
-+		intensity = 0;
-+
-+	spin_lock_irqsave(&bl_lock, flags);
-+
-+	PWM_CTRL0 = 2; /* pre-scaler */
-+	PWM_PWDUTY0 = intensity; /* duty cycle */
-+	PWM_PERVAL0 = 49; /* period */
-+
-+	if (intensity) {
-+			//pxa_set_cken(CKEN0_PWM0, 1);
-+			//FIXME: Set PWM0 GPIO as output
-+	} else {
-+			//pxa_set_cken(CKEN0_PWM0, 0);
-+			//FIXME: Set PWM0 GPIO as input
-+	}
-+
-+	spin_unlock_irqrestore(&bl_lock, flags);
-+	current_intensity = intensity;
-+	return 0;
-+}
-+
-+static int ezx_get_intensity(struct backlight_device *bd)
-+{
-+	return current_intensity;
-+}
-+
-+static int ezx_set_intensity(struct backlight_device *bd)
-+{
-+	return ezx_send_intensity(ezx_backlight_device);
-+}
-+
-+#ifdef CONFIG_PM
-+static int ezx_bl_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	//set suspend flag
-+	ezx_set_intensity(ezx_backlight_device);
-+	return 0;
-+}
-+
-+static int ezx_bl_resume(struct platform_device *pdev)
-+{
-+	// set resume flag
-+	ezx_set_intensity(ezx_backlight_device);
-+	return 0;
-+}
-+#else
-+#define ezx_bl_suspend	NULL
-+#define ezx_bl_resume	NULL
-+#endif
-+
-+static struct backlight_properties ezx_bl_data = {
-+	.owner          = THIS_MODULE,
-+	.get_brightness = ezx_get_intensity,
-+	.max_brightness = EZX_MAX_INTENSITY,
-+	.update_status	= ezx_set_intensity,
-+};
-+
-+static int __init ezx_bl_probe(struct platform_device *pdev)
-+{
-+	ezx_backlight_device = backlight_device_register ("ezx-bl",
-+		NULL, &ezx_bl_data);
-+	if (IS_ERR (ezx_backlight_device))
-+		return PTR_ERR (ezx_backlight_device);
-+
-+	//ezx_bl_data.requested_brightness = EZX_DEFAULT_INTENSITY;
-+	//ezx_bl_data.requested_power = FB_BLANK_UNBLANK;
-+	//ezx_set_intensity(ezx_backlight_device, ezx_bl_data.requested_brightness);
-+
-+	printk("EZX Backlight Driver Initialized.\n");
-+	return 0;
-+}
-+
-+static int ezx_bl_remove(struct platform_device *pdev)
-+{
-+	backlight_device_unregister(ezx_backlight_device);
-+
-+	printk("EZX Backlight Driver Unloaded.\n");
-+	return 0;
-+}
-+
-+static struct platform_driver ezx_bl_driver = {
-+	.probe		= ezx_bl_probe,
-+	.remove		= ezx_bl_remove,
-+	.suspend	= ezx_bl_suspend,
-+	.resume		= ezx_bl_resume,
-+	.driver		= {
-+		.name		= "ezx-bl",
-+	},
-+};
-+
-+static int __init ezx_bl_init(void)
-+{
-+	return platform_driver_register(&ezx_bl_driver);
-+}
-+
-+static void __exit ezx_bl_exit(void)
-+{
-+ 	platform_driver_unregister(&ezx_bl_driver);
-+}
-+
-+module_init(ezx_bl_init);
-+module_exit(ezx_bl_exit);
-+
-+MODULE_AUTHOR("Michael Lauer <mickey@Vanille.de>");
-+MODULE_DESCRIPTION("Backlight Driver for Motorola A780|E680(i)");
-+MODULE_LICENSE("GPL");
diff --git a/packages/linux/linux-ezx/ezx-backlight-r1.patch b/packages/linux/linux-ezx/ezx-backlight-r1.patch
deleted file mode 100644
index a277f19344..0000000000
--- a/packages/linux/linux-ezx/ezx-backlight-r1.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~ezx-backlight-r1.patch	2006-06-08 19:33:36.000000000 +0200
-+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c	2006-06-08 19:33:37.000000000 +0200
-@@ -274,34 +274,9 @@
- 	.udc_command		= ezx_udc_command,
- };
- 
--/* pxafb */
--
--#define BKLIGHT_PRESCALE	2
--#define BKLIGHT_PERIOD		49
--#define DEFAULT_DUTYCYCLE	25
--#define MAX_DUTYCYCLE		(BKLIGHT_PERIOD+1)
--#define MIN_DUTYCYCLE		0
--
--static void pxafb_backlight_power(int on)
--{
--	if (on) {
--		CKEN |= CKEN0_PWM0;
--		PWM_CTRL0 = BKLIGHT_PRESCALE;
--		PWM_PERVAL0 = BKLIGHT_PERIOD;
--		PWM_PWDUTY0 = DEFAULT_DUTYCYCLE;
--
--		GPDR0 |= 0x00010000; //PWM0 is GPIO16
--		pxa_gpio_mode(GPIO16_PWM0_MD);
--	} else {
--		PWM_PWDUTY0 = 0;
--		GAFR0_U &= 0xfffffffc;
--		GPDR0 &= 0xfffeffff; /* set gpio16 (pwm0) as input */
--		CKEN &= ~CKEN0_PWM0;
--		PWM_PWDUTY0 = MIN_DUTYCYCLE;
--	}
--}
--
--//#define mdelay(x) udelay((x)*1000)
-+/*
-+ * EZX PXA Framebuffer
-+ */
- 
- static void pxafb_lcd_power(int on)
- {
-@@ -326,35 +301,24 @@
- 	.xres		= 240,
- 	.yres		= 320,
- 	.bpp		= 16,
--
- 	.hsync_len	= 10,
- 	.left_margin	= 20,
- 	.right_margin	= 10,
--
- 	.vsync_len	= 2,
- 	.upper_margin	= 3,
- 	.lower_margin	= 2,
--
- 	.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
--
- 	.lccr0		= 0x002008F8,
- 	.lccr3		= 0x0430FF09,
--
--	.pxafb_backlight_power	= &pxafb_backlight_power,
--	.pxafb_lcd_power	= &pxafb_lcd_power,
--};
--
--
--/* backlight for lcd */
--
--static struct resource ezx_backlight_resources[] = {
-+	.pxafb_lcd_power= &pxafb_lcd_power,
- };
- 
--static struct platform_device ezx_backlight_device = {
--	.name		= "ezx-lcd-backlight",
-+/*
-+ * EZX LCD Backlight
-+ */
-+static struct platform_device ezxbacklight_device = {
-+	.name		= "ezx-bl",
- 	.id		= -1,
--	.resource	= ezx_backlight_resources,
--	.num_resources	= ARRAY_SIZE(ezx_backlight_resources),
- };
- 
- #ifdef CONFIG_PXA_EZX_E680
-@@ -786,6 +750,7 @@
- 
- static struct platform_device *devices[] __initdata = {
- 	&ezx_bp_device,
-+	&ezxbacklight_device,
- #ifdef CONFIG_PXA_EZX_E680
- 	&e680led_device,
- #endif
---- linux-2.6.16/drivers/video/backlight/Kconfig~ezx-backlight-r1.patch	2006-06-08 19:33:34.000000000 +0200
-+++ linux-2.6.16/drivers/video/backlight/Kconfig	2006-06-08 19:33:37.000000000 +0200
-@@ -58,3 +58,12 @@
- 	  If you have a HP Jornada 680, say y to enable the
- 	  backlight driver.
- 
-+config BACKLIGHT_EZX
-+	tristate "Motorola EXZ Backlight Driver (A780/E680/E680i)"
-+	depends on BACKLIGHT_DEVICE && PXA_EZX
-+	default y
-+	help
-+	  If you have a Motorola A780 or E680(i), say y to enable the
-+	  backlight driver.
-+
-+
---- linux-2.6.16/drivers/video/backlight/Makefile~ezx-backlight-r1.patch	2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/drivers/video/backlight/Makefile	2006-06-08 19:33:37.000000000 +0200
-@@ -5,3 +5,5 @@
- obj-$(CONFIG_BACKLIGHT_CORGI)	+= corgi_bl.o
- obj-$(CONFIG_BACKLIGHT_HP680)	+= hp680_bl.o
- obj-$(CONFIG_SHARP_LOCOMO)	+= locomolcd.o
-+obj-$(CONFIG_BACKLIGHT_EZX)	+= ezx_bl.o
-+
---- /dev/null	2006-06-08 19:04:31.354926880 +0200
-+++ linux-2.6.16/drivers/video/backlight/ezx_bl.c	2006-06-08 20:52:33.000000000 +0200
-@@ -0,0 +1,156 @@
-+/*
-+ * Backlight Driver for Motorola A780 and E680(i) GSM Phones.
-+ *
-+ * Copyright 2006 Vanille Media
-+ *
-+ * Author: Michael Lauer <mickey@Vanille.de>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+
-+#include <asm/arch/pxa-regs.h>
-+#include <asm/arch/ezx.h>
-+
-+#define EZX_MIN_INTENSITY      00
-+#define EZX_MAX_INTENSITY      50
-+#define EZX_DEFAULT_INTENSITY  25
-+
-+static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
-+static struct backlight_device *ezx_backlight_device;
-+static int last_intensity;
-+
-+static int ezxbl_send_intensity(struct backlight_device *bd)
-+{
-+	unsigned long flags;
-+	int intensity = bd->props->brightness;
-+
-+	printk( KERN_DEBUG "ezx_set_intensity to %d\n", intensity );
-+
-+	if (bd->props->power != FB_BLANK_UNBLANK)
-+		intensity = 0;
-+	if (bd->props->fb_blank != FB_BLANK_UNBLANK)
-+		intensity = 0;
-+
-+	spin_lock_irqsave(&bl_lock, flags);
-+
-+	printk( KERN_DEBUG "backlight last intensity was %d, new intensity is %d\n", last_intensity, intensity );
-+	
-+	if ( !last_intensity && intensity ) {
-+		printk( KERN_DEBUG "backlight power ON\n" );
-+		PWM_CTRL0 = 2; /* pre-scaler */
-+		PWM_PWDUTY0 = intensity; /* duty cycle */
-+		PWM_PERVAL0 = 49; /* period */
-+		pxa_gpio_mode(GPIO16_PWM0_MD); /* set GPIO16 as alternate function + output */
-+		pxa_set_cken(CKEN0_PWM0, 1); /* clock enable */
-+	}
-+	else if ( last_intensity && !intensity ) {
-+		printk( KERN_DEBUG "backlight power OFF\n" );
-+		PWM_PWDUTY0 = 0;
-+		GAFR0_U &= 0xFFFFFFFC; /* ??? */
-+		pxa_set_cken(CKEN0_PWM0, 0); /* clock disable */
-+		pxa_gpio_mode(GPIO16_PWM0); /* set GPIO16 as input */
-+	} else if ( last_intensity && intensity ) {
-+		printk( KERN_DEBUG "backlight adjusting duty cycle\n" );
-+		PWM_PWDUTY0 = intensity; /* duty cycle */
-+	}
-+	spin_unlock_irqrestore(&bl_lock, flags);
-+	last_intensity = intensity;
-+	return 0;
-+}
-+
-+static int ezxbl_get_intensity(struct backlight_device *bd)
-+{
-+	return last_intensity;
-+}
-+
-+static int ezxbl_set_intensity(struct backlight_device *bd)
-+{
-+	return ezxbl_send_intensity(ezx_backlight_device);
-+}
-+
-+#ifdef CONFIG_PM
-+static int ezxbl_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	//set suspend flag
-+	ezxbl_set_intensity(ezx_backlight_device);
-+	return 0;
-+}
-+
-+static int ezxbl_resume(struct platform_device *pdev)
-+{
-+	// set resume flag
-+	ezxbl_set_intensity(ezx_backlight_device);
-+	return 0;
-+}
-+#else
-+#define ezxbl_suspend	NULL
-+#define ezxbl_resume	NULL
-+#endif
-+
-+static struct backlight_properties ezxbl_data = {
-+	.owner          = THIS_MODULE,
-+	.get_brightness = ezxbl_get_intensity,
-+	.max_brightness = EZX_MAX_INTENSITY,
-+	.update_status	= ezxbl_set_intensity,
-+};
-+
-+static int __init ezxbl_probe(struct platform_device *pdev)
-+{
-+	ezx_backlight_device = backlight_device_register ("ezx-bl",
-+		NULL, &ezxbl_data);
-+	if (IS_ERR (ezx_backlight_device))
-+		return PTR_ERR (ezx_backlight_device);
-+
-+	ezxbl_data.power = FB_BLANK_UNBLANK;
-+	ezxbl_data.brightness = EZX_DEFAULT_INTENSITY;
-+	ezxbl_set_intensity(ezx_backlight_device);
-+
-+	printk("EZX Backlight Driver Initialized.\n");
-+	return 0;
-+}
-+
-+static int ezxbl_remove(struct platform_device *pdev)
-+{
-+	backlight_device_unregister(ezx_backlight_device);
-+
-+	printk("EZX Backlight Driver Unloaded.\n");
-+	return 0;
-+}
-+
-+static struct platform_driver ezxbl_driver = {
-+	.probe		= ezxbl_probe,
-+	.remove		= ezxbl_remove,
-+	.suspend	= ezxbl_suspend,
-+	.resume		= ezxbl_resume,
-+	.driver		= {
-+		.name		= "ezx-bl",
-+	},
-+};
-+
-+static int __init ezxbl_init(void)
-+{
-+	return platform_driver_register(&ezxbl_driver);
-+}
-+
-+static void __exit ezxbl_exit(void)
-+{
-+ 	platform_driver_unregister(&ezxbl_driver);
-+}
-+
-+module_init(ezxbl_init);
-+module_exit(ezxbl_exit);
-+
-+MODULE_AUTHOR("Michael Lauer <mickey@Vanille.de>");
-+MODULE_DESCRIPTION("Backlight Driver for Motorola A780|E680(i)");
-+MODULE_LICENSE("GPL");
diff --git a/packages/linux/linux-ezx/pxa-serial-gcc4.diff b/packages/linux/linux-ezx/pxa-serial-gcc4.diff
new file mode 100644
index 0000000000..7f827965e9
--- /dev/null
+++ b/packages/linux/linux-ezx/pxa-serial-gcc4.diff
@@ -0,0 +1,11 @@
+--- /tmp/pxa.c	2006-08-29 10:51:57.000000000 +0200
++++ linux-2.6.16/drivers/serial/pxa.c	2006-08-29 10:52:38.545780000 +0200
+@@ -241,7 +241,7 @@
+ /*
+  * This handles the interrupt from one port.
+  */
+-static inline irqreturn_t
++inline irqreturn_t
+ serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	struct uart_pxa_port *up = (struct uart_pxa_port *)dev_id;
diff --git a/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch b/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch
deleted file mode 100644
index 1dedb981bd..0000000000
--- a/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/drivers/input/keyboard/pxakbd.c~pxakbd-fix-directkeys.patch	2006-06-11 00:47:25.000000000 +0200
-+++ linux-2.6.16/drivers/input/keyboard/pxakbd.c	2006-06-12 16:10:03.000000000 +0200
-@@ -20,7 +20,7 @@
- #include <asm/arch/irqs.h>
- #include <asm/arch/pxa-regs.h>
- 
--#if 0
-+#if 1
- #define DEBUGP(x, args ...) printk(x, ## args)
- #else
- #define DEBUGP(x, args ...)
-@@ -44,8 +44,7 @@
- 	unsigned int i;
- 	int num_pressed = 0;
- 
--	kpdk = KPDK & 0x0000000f;
--
-+	kpdk = KPDK & 0x000000ff;
- 	for (i = 0; i < pxakbd->pd->direct.num; i++) {
- 		int pressed = 0;
- 
-@@ -54,11 +53,12 @@
- 			num_pressed++;
- 			DEBUGP("pxakbd: pressed: direct %u\n", i);
- 		}
--
--		input_report_key(pxakbd->input, pxakbd->pd->direct.keycode[i],
--				 pressed);
-+		if (pxakbd->pd->direct.keycode[i] != KEY_RESERVED) {
-+			DEBUGP( "pxakbd: sending to input layer: keycode = %d, pressed = %d\n", pxakbd->pd->direct.keycode[i], pressed );
-+			input_report_key(pxakbd->input, pxakbd->pd->direct.keycode[i],
-+			pressed);
-+		}
- 	}
--
- 	return num_pressed;
- }
- 
-@@ -248,16 +248,6 @@
- 		set_bit(pxakbd->pd->matrix.keycode[i], input_dev->keybit);
- 	clear_bit(0, input_dev->keybit);
- 
--#if 0
--	input_dev2->evbit[0] = ;
--	input_dev2->keycode = pxakbd->pd->direct.keycode;
--	input_dev2->keycodesize = sizeof(unsigned char);
--	input_dev2->keycodemax = pxakbd->pd->direct.num;
--
--	for (i = 0; i < input_dev2->keycodemax; i++)
--		set_bit(ezxkbd->keycode[i], input_dev2->keybit);
--#endif
--
- 	if (request_irq(pxakbd->irq, pxakbd_interrupt, 0, "pxakbd", pxakbd)) {
- 		printk(KERN_ERR "pxakbd: can't request irq %d\n", pxakbd->irq);
- 		ret = -EBUSY;
-@@ -279,6 +269,7 @@
- 		KPC_ME | KPC_DE |   /* matrix and direct keypad enabled */
- 		((pxakbd->pd->matrix.cols-1)<<23) | /* columns */
- 		((pxakbd->pd->matrix.rows-1)<<26) | /* rows */
-+		((pxakbd->pd->direct.num-1)<<6) | /* direct keys */
- 		KPC_MS_ALL); /* scan all columns */
- 
- 	pxa_set_cken(CKEN19_KEYPAD, 1);
-@@ -375,13 +366,11 @@
- static int pxakbd_remove(struct platform_device *pdev)
- {
- 	struct pxakbd *pxakbd = platform_get_drvdata(pdev);
--
-+	input_unregister_device(pxakbd->input);
- 	platform_set_drvdata(pdev, NULL);
- 	release_resource(pxakbd->res);
- 	free_irq(pxakbd->irq, pxakbd);
--	input_unregister_device(pxakbd->input);
- 	kfree(pxakbd);
--
- 	return 0;
- }
- 
diff --git a/packages/linux/linux-ezx/sa1100-rtc-gcc4.diff b/packages/linux/linux-ezx/sa1100-rtc-gcc4.diff
new file mode 100644
index 0000000000..6fd54ece3a
--- /dev/null
+++ b/packages/linux/linux-ezx/sa1100-rtc-gcc4.diff
@@ -0,0 +1,11 @@
+--- /tmp/sa1100-rtc.c	2006-08-29 10:51:48.000000000 +0200
++++ linux-2.6.16/drivers/char/sa1100-rtc.c	2006-08-29 10:52:14.995780000 +0200
+@@ -126,7 +126,7 @@
+ 	tval->tm_mday = days + 1;
+ }
+ 
+-static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	unsigned int rtsr = RTSR;
+ 
diff --git a/packages/linux/linux-ezx/touchscreen-fix-r0.patch b/packages/linux/linux-ezx/touchscreen-fix-r0.patch
deleted file mode 100644
index 7d19a887fc..0000000000
--- a/packages/linux/linux-ezx/touchscreen-fix-r0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.6.16/drivers/input/touchscreen/pcap_ts.c~touchscreen-fix-r0	2006-05-30 23:18:22.000000000 +0200
-+++ linux-2.6.16/drivers/input/touchscreen/pcap_ts.c	2006-05-30 23:29:34.000000000 +0200
-@@ -126,10 +126,7 @@
- 	if (ret < 0)
- 		return ret;
- 
--	if (tmp & 0x00400000)
--		return -EIO;
--
--	if (pcap_ts->read_state == COORDINATE) {
-+	if (pcap_ts->read_state == COORDINATE && !(tmp & 0x00400000)) {
- 		pcap_ts->x = (tmp & SSP_PCAP_ADD1_VALUE_MASK);
- 		pcap_ts->y = (tmp & SSP_PCAP_ADD2_VALUE_MASK)
- 						>>SSP_PCAP_ADD2_VALUE_SHIFT;
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index f326321217..6da8a32a21 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "http://www.openezx.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
-EZX = "ezx6"
-PR = "${EZX}-r13"
+EZX = "ezx7"
+PR = "${EZX}-r0"
 
 inherit kernel
 
@@ -17,33 +17,12 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
 # source and patches
 #
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
-	   http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-exz6-symlink-fix.tar.bz2 \
+           http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-ezx7.tar.bz2 \
            \
-           ${RPSRC}/led_core-r15.patch;patch=1 \
-           ${RPSRC}/led_triggers-r14.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r8.patch;patch=1 \
-           ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r10.patch;patch=1 \
-           ${RPSRC}/led_locomo-r7.patch;patch=1 \
-           ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \
-           ${RPSRC}/led_tosa-r5.patch;patch=1 \
-           ${RPSRC}/led_ide-r6.patch;patch=1 \
-           ${RPSRC}/led_nand-r3.patch;patch=1 \
-           ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1 \
-           ${RPSRC}/corgi_bl_generic-r3.patch;patch=1 \
-           ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1 \
-           \
-	   file://touchscreen-fix-r0.patch;patch=1 \
-           \
-           file://e680-disable-boomer-HACK.patch;patch=1 \
-           \
-           file://e680-leds-r1.patch;patch=1 \
-           file://a780-leds-r0.patch;patch=1 \
-           file://ezx-backlight-r1.patch;patch=1 \
-           file://e680-fix-keypad.patch;patch=1 \
-           file://pxakbd-fix-directkeys.patch;patch=1 \
-           \
-           file://logo_linux_clut224.ppm \
+           file://sa1100-rtc-gcc4.diff;patch=1 \
+	   file://pxa-serial-gcc4.diff;patch=1 \
+	   \
+	   file://logo_linux_clut224.ppm \
            file://defconfig-a780 \
            file://defconfig-e680"
 S = "${WORKDIR}/linux-2.6.16"
@@ -79,7 +58,6 @@ do_ezxpatch() {
 }
 
 do_configure() {
-	mv ${S}/.config harald.config
 	install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
 
 	if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then
diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb
index 7ea9e16091..46e7d0ba95 100644
--- a/packages/linux/linux-omap1_2.6.12-rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12-rc2.bb
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
 KERNEL_CCSUFFIX = "-3.3.4"
 
-#DEPENDS = "uboot"
+DEPENDS = "u-boot"
 
 inherit kernel
 
@@ -25,13 +25,17 @@ do_configure_prepend() {
         oe_runmake oldconfig
 }
 
-do_deploy_omap5912osk() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR}/linux.bin
-        gzip -f -9 ${DEPLOY_DIR}/linux.bin
-        mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR}/linux.bin.gz ${DEPLOY_DIR}/uImage_bb.cc
-        cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
-#        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+do_deploy() {
+        if [ "${MACHINE}" == "omap5912osk" ]; then
+                install -d ${DEPLOY_DIR_IMAGE}
+                arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
+                gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+                rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
+
+#               cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
+#               install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        fi
 }
 
 
diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb
new file mode 100644
index 0000000000..7a5ff66af2
--- /dev/null
+++ b/packages/linux/linux-omap1_2.6.x+git.bb
@@ -0,0 +1,39 @@
+PR      = "r0"
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for OMAP processors"
+LICENSE = "GPL"
+
+SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
+
+DEPENDS = "u-boot"
+
+inherit kernel
+
+COMPATIBLE_HOST = 'arm.*-linux'
+
+do_configure_prepend() {
+        if [ "${MACHINE}" == "omap5912osk" ] ; then
+                 oe_runmake omap_osk_5912_defconfig
+        fi
+
+}        
+
+do_deploy() {
+        if [ "${MACHINE}" == "omap5912osk" ]; then
+                install -d ${DEPLOY_DIR_IMAGE}
+                arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
+                gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+                rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
+        fi
+}
+
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch b/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch
new file mode 100644
index 0000000000..cb014fb8bc
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch
@@ -0,0 +1,157 @@
+Index: linux-tosa/arch/arm/mach-pxa/tosa.c
+===================================================================
+--- linux-tosa.orig/arch/arm/mach-pxa/tosa.c	2006-08-29 16:52:59.000000000 +0100
++++ linux-tosa/arch/arm/mach-pxa/tosa.c	2006-08-29 16:55:25.959706776 +0100
+@@ -2,6 +2,7 @@
+  *  Support for Sharp SL-C6000x PDAs
+  *  Model: (Tosa)
+  *
++ *  Copyright (c) 2006 Wolfson Microelectronics PLC.
+  *  Copyright (c) 2005 Dirk Opfer
+  *
+  *	Based on code written by Sharp/Lineo for 2.4 kernels
+@@ -46,6 +47,8 @@
+ #include <asm/hardware/tmio.h>
+ #include <asm/mach/sharpsl_param.h>
+ 
++#include <linux/wm97xx.h>
++
+ #include "generic.h"
+ 
+ /*
+@@ -428,6 +431,16 @@
+     },
+ };
+ 
++
++/*
++ * Tosa Touchscreen device
++ */
++
++static struct wm97xx_machinfo tosa_ts_machinfo = {
++    .get_hsync_time   = tosa_get_hsync_time,
++    .wait_hsync       = tosa_wait_hsync,
++};
++
+ /*
+  * Tosa Blueooth
+  */
+@@ -457,6 +470,7 @@
+ 	GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET);
+ 
+ 	mdelay(1000);
++    wm97xx_unset_machinfo();
+ }
+ 
+ static void tosa_restart(void)
+@@ -501,6 +515,8 @@
+ 	platform_scoop_config = &tosa_pcmcia_config;
+ 
+ 	platform_add_devices(devices, ARRAY_SIZE(devices));
++
++    wm97xx_set_machinfo(&tosa_ts_machinfo);
+ }
+ 
+ static void __init fixup_tosa(struct machine_desc *desc,
+Index: linux-tosa/arch/arm/mach-pxa/tosa_lcd.c
+===================================================================
+--- linux-tosa.orig/arch/arm/mach-pxa/tosa_lcd.c	2006-08-29 16:52:59.000000000 +0100
++++ linux-tosa/arch/arm/mach-pxa/tosa_lcd.c	2006-08-29 16:55:32.818664056 +0100
+@@ -1,6 +1,7 @@
+ /*
+  *  LCD / Backlight control code for Sharp SL-6000x (tosa)
+  *
++ *  Copyright (c) 2006      Wolfson Microelectronics PLC.
+  *  Copyright (c) 2005		Dirk Opfer
+  *
+  *  This program is free software; you can redistribute it and/or modify
+@@ -59,6 +60,8 @@
+ static struct ssp_dev tosa_nssp_dev;
+ static struct ssp_state tosa_nssp_state;
+ static spinlock_t tosa_nssp_lock;
++static int blanked;
++static unsigned long hsync_time;
+ 
+ static unsigned short normal_i2c[] = {
+ 	DAC_BASE,
+@@ -130,6 +133,17 @@
+ 	pxa_nssp_output(TG_GPOSR,0x02);		/* GPOS0=powercontrol, GPOS1=GPIO, GPOS2=TCTL */
+ }
+ 
++static unsigned long calc_hsync_time(const struct fb_videomode *mode) {
++    /* The 25 and 44 'magic numbers' are from Sharp's 2.4 patches */
++    if (mode->yres == 640) {
++        return 25;
++    }
++    if (mode->yres == 320) {
++        return 44;
++    }
++    return 0;
++}
++
+ static void tosa_lcd_tg_on(struct device *dev, const struct fb_videomode *mode)
+ {
+ 	const int value = TG_REG0_COLOR | TG_REG0_UD | TG_REG0_LR;
+@@ -154,6 +168,8 @@
+ 		/* set common voltage */
+ 		i2c_smbus_write_byte_data(tosa_i2c_dac, DAC_CH1, comadj);
+ 
++    blanked = 0;
++    hsync_time = calc_hsync_time(mode);
+ }
+ 
+ static void tosa_lcd_tg_off(struct device *dev)
+@@ -172,6 +188,8 @@
+ 	
+ 	/* L3V Off */
+ 	reset_scoop_gpio( &tosascoop_jc_device.dev,TOSA_SCOOP_JC_TC3693_L3V_ON); 
++
++    blanked = 1;
+ }
+ 
+ static int tosa_detect_client(struct i2c_adapter* adapter, int address, int kind) {
+@@ -238,6 +256,23 @@
+ 	return 0;
+ }
+ 
++unsigned long tosa_get_hsync_time(void)
++{
++/* This method should eventually contain the correct algorithm for calculating
++   the hsync_time */
++    if (blanked)
++        return 0;
++    else
++        return hsync_time;
++}
++
++void tosa_wait_hsync(void)
++{
++    /* Waits for a rising edge on the VGA line */
++    while((GPLR(TOSA_GPIO_VGA_LINE) & GPIO_bit(TOSA_GPIO_VGA_LINE)) == 0);
++    while((GPLR(TOSA_GPIO_VGA_LINE) & GPIO_bit(TOSA_GPIO_VGA_LINE)) != 0);
++}
++
+ static struct i2c_driver tosa_driver={
+ 	.id		= TOSA_LCD_I2C_DEVICEID,
+ 	.attach_adapter	= tosa_attach_adapter,
+Index: linux-tosa/include/asm-arm/arch-pxa/tosa.h
+===================================================================
+--- linux-tosa.orig/include/asm-arm/arch-pxa/tosa.h	2006-08-29 16:52:59.000000000 +0100
++++ linux-tosa/include/asm-arm/arch-pxa/tosa.h	2006-08-29 16:55:12.442761664 +0100
+@@ -1,6 +1,7 @@
+ /*
+  * Hardware specific definitions for Sharp SL-C6000x series of PDAs
+  *
++ * Copyright (c) 2006 Wolfson Microelectronics PLC.
+  * Copyright (c) 2005 Dirk Opfer
+  *
+  * Based on Sharp's 2.4 kernel patches
+@@ -187,4 +188,8 @@
+ extern struct platform_device tosascoop_jc_device;
+ extern struct platform_device tosascoop_device;
+ extern struct platform_device tc6393_device;
++
++unsigned long tosa_get_hsync_time(void);
++void tosa_wait_hsync(void);
++
+ #endif /* _ASM_ARCH_TOSA_H_ */
diff --git a/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch
new file mode 100644
index 0000000000..191de3af22
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch
@@ -0,0 +1,208 @@
+Index: linux-tosa/drivers/input/touchscreen/wm9712.c
+===================================================================
+--- linux-tosa.orig/drivers/input/touchscreen/wm9712.c	2006-08-29 16:52:36.008543280 +0100
++++ linux-tosa/drivers/input/touchscreen/wm9712.c	2006-08-29 16:52:50.923275896 +0100
+@@ -1,7 +1,7 @@
+ /*
+  * wm9712.c  --  Codec driver for Wolfson WM9712 AC97 Codecs.
+  *
+- * Copyright 2003, 2004, 2005 Wolfson Microelectronics PLC.
++ * Copyright 2003, 2004, 2005, 2006 Wolfson Microelectronics PLC.
+  * Author: Liam Girdwood
+  *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+  * Parts Copyright : Ian Molton <spyro@f2s.com>
+@@ -13,6 +13,12 @@
+  *  Free Software Foundation;  either version 2 of the  License, or (at your
+  *  option) any later version.
+  *
++ *  Revision history
++ *     4th Jul 2005  Initial version.
++ *    29th Aug 2006  Mike Arthur <mike@mikearthur.co.uk>
++ *                   Added fixes for Sharp SL-6000 (Tosa) LCD noise causing
++ *                   touchscreen interference.
++ *
+  */
+ 
+ #include <linux/module.h>
+@@ -28,6 +34,10 @@
+ #define WM9705_VERSION		"0.60"
+ #define DEFAULT_PRESSURE	0xb0c0
+ 
++#define CCNT(a)     asm volatile ("mrc p14, 0, %0, C1, C1, 0" : "=r"(a))
++#define CCNT_ON()   asm("mcr p14, 0, %0, C0, C0, 0" : : "r"(1))
++#define CCNT_OFF()  asm("mcr p14, 0, %0, C0, C0, 0" : : "r"(1))
++
+ /*
+  * Debug
+  */
+@@ -243,6 +253,36 @@
+ 	return wm->dig[2] & WM9712_PDEN;
+ }
+ 
++
++#ifdef CONFIG_MACH_TOSA
++/* On the Sharp SL-6000 (Tosa), due to a noisy LCD, we need to perform a wait
++ * before sampling the Y axis of the touchscreen */
++static inline void wm9712_lcd_sync_on(struct wm97xx* wm, int adcsel) {
++    unsigned long timer1 = 0, timer2 = 0, wait_time = 0;
++    if (adcsel == WM97XX_ADCSEL_Y) {
++        wait_time = wm97xx_calc_lcd_waittime(wm);
++
++        CCNT_ON();
++
++        if (wait_time) {
++            /* wait for LCD rising edge */
++            wm_machinfo->wait_hsync();
++            /* get clock */
++            CCNT(timer1);
++            CCNT(timer2);
++
++            while ((timer2 - timer1) < wait_time) {
++                CCNT(timer2);
++            }
++        }
++    }
++}
++
++static inline void wm9712_lcd_sync_off(void) {
++    CCNT_OFF();
++}
++#endif
++
+ /*
+  * Read a sample from the WM9712 adc in polling mode.
+  */
+@@ -260,6 +300,9 @@
+ 	/* set up digitiser */
+ 	if (adcsel & 0x8000)
+ 		adcsel = ((adcsel & 0x7fff) + 3) << 12;
++    #ifdef CONFIG_MACH_TOSA
++    wm9712_lcd_sync_on(wm, adcsel);
++    #endif
+ 	wm97xx_reg_write(wm, AC97_WM97XX_DIGITISER1, adcsel | WM97XX_POLL | WM97XX_DELAY(delay));
+ 	
+ 	/* wait 3 AC97 time slots + delay for conversion */
+@@ -282,6 +325,10 @@
+ 	
+ 	*sample = wm97xx_reg_read(wm, AC97_WM97XX_DIGITISER_RD);
+ 	
++    #ifdef CONFIG_MACH_TOSA
++    wm9712_lcd_sync_off();
++    #endif
++
+ 	/* check we have correct sample */
+ 	if ((*sample & WM97XX_ADCSEL_MASK) != adcsel) {
+ 		dbg ("adc wrong sample, read %x got %x", adcsel,
+@@ -303,11 +350,12 @@
+ static int wm9712_poll_touch(struct wm97xx* wm, struct wm97xx_data *data)
+ {
+ 	int rc;
+-	
+ 	if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_X, &data->x)) != RC_VALID)
+ 		return rc;
++
+ 	if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_Y, &data->y)) != RC_VALID)
+ 		return rc;
++
+ 	if (pil && !five_wire) {
+ 		if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_PRES, &data->p)) != RC_VALID)
+ 			return rc;
+Index: linux-tosa/drivers/input/touchscreen/wm97xx-core.c
+===================================================================
+--- linux-tosa.orig/drivers/input/touchscreen/wm97xx-core.c	2006-08-29 16:52:36.008543280 +0100
++++ linux-tosa/drivers/input/touchscreen/wm97xx-core.c	2006-08-29 16:52:50.924275744 +0100
+@@ -2,7 +2,7 @@
+  * wm97xx-core.c  --  Touch screen driver core for Wolfson WM9705, WM9712
+  *                           and WM9713 AC97 Codecs.
+  *
+- * Copyright 2003, 2004, 2005 Wolfson Microelectronics PLC.
++ * Copyright 2003, 2004, 2005, 2006 Wolfson Microelectronics PLC.
+  * Author: Liam Girdwood
+  *         liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
+  * Parts Copyright : Ian Molton <spyro@f2s.com>
+@@ -67,6 +67,9 @@
+  *                   GPIOs) and 2.6 power management. 
+  *    29th Nov 2004  Added WM9713 support.
+  *     4th Jul 2005  Moved codec specific code out to seperate files.
++ *    29th Aug 2006  Mike Arthur <mike@mikearthur.co.uk>
++ *                   Added fixes for Sharp SL-6000 (Tosa) LCD noise causing
++ *                   touchscreen interference.
+  */  
+     
+ #include <linux/module.h>
+@@ -94,6 +97,7 @@
+ static DECLARE_MUTEX(gpio_sem);
+ static LIST_HEAD(wm97xx_misc_list);
+ static struct wm97xx* wm_codec = NULL;
++struct wm97xx_machinfo *wm_machinfo;
+ 
+ /*
+  * WM97xx - enable/disable AUX ADC sysfs 
+@@ -832,6 +836,23 @@
+ 		mdev->remove(wm_codec);
+ }
+ 
++#ifdef CONFIG_MACH_TOSA
++/* On the Sharp SL-6000 (Tosa), due to a noisy LCD, we need to perform a wait
++ * before sampling the Y axis of the touchscreen */
++unsigned long wm97xx_calc_lcd_waittime(struct wm97xx *wm) {
++    unsigned long hsync_time = wm_machinfo->get_hsync_time();
++    return hsync_time;
++}
++
++void wm97xx_set_machinfo(struct wm97xx_machinfo *machinfo) {
++    wm_machinfo = machinfo;
++}
++
++void wm97xx_unset_machinfo() {
++    wm_machinfo = NULL;
++}
++#endif
++
+ static struct device_driver wm97xx_driver = {
+ 	.name = 	"ac97", 
+ 	.bus = 		&ac97_bus_type, 
+@@ -861,6 +882,9 @@
+ EXPORT_SYMBOL_GPL(wm97xx_reg_write);
+ EXPORT_SYMBOL_GPL(wm97xx_register_misc_dev);
+ EXPORT_SYMBOL_GPL(wm97xx_unregister_misc_dev);
++EXPORT_SYMBOL_GPL(wm97xx_calc_lcd_waittime);
++EXPORT_SYMBOL_GPL(wm97xx_set_machinfo);
++EXPORT_SYMBOL_GPL(wm97xx_unset_machinfo);
+ 
+ module_init(wm97xx_init); 
+ module_exit(wm97xx_exit);
+Index: linux-tosa/include/linux/wm97xx.h
+===================================================================
+--- linux-tosa.orig/include/linux/wm97xx.h	2006-08-29 16:52:36.008543280 +0100
++++ linux-tosa/include/linux/wm97xx.h	2006-08-29 16:52:50.924275744 +0100
+@@ -207,6 +207,7 @@
+ 
+ struct wm97xx;
+ extern struct wm97xx_codec_drv wm97xx_codec;
++extern struct wm97xx_machinfo *wm_machinfo;
+ 
+ /*
+  * Codec driver interface - allows mapping to WM9705/12/13 and newer codecs
+@@ -253,6 +254,11 @@
+ 	struct list_head list;
+ };
+ 
++struct wm97xx_machinfo {
++    unsigned long (*get_hsync_time)(void);
++    void (*wait_hsync)(void);
++};
++
+ int wm97xx_register_misc_dev(struct wm97xx_misc_dev* mdev);
+ void wm97xx_unregister_misc_dev(struct wm97xx_misc_dev* mdev);
+ 
+@@ -281,4 +287,9 @@
+ int wm97xx_acc_startup(struct wm97xx* wm);
+ void wm97xx_acc_shutdown(struct wm97xx* wm);
+ 
++
++unsigned long wm97xx_calc_lcd_waittime(struct wm97xx *wm);
++void wm97xx_set_machinfo(struct wm97xx_machinfo *machinfo);
++void wm97xx_unset_machinfo(void);
++
+ #endif
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index f8fd9432ec..1ebd1023fb 100644
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r8"
+PR = "r10"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,15 +15,19 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 #           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
-SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=ab36ce8c77403da4362de0447d188cd049d52d81 \
-           ${RPSRC}/alsa/asoc-v0.11pre2.patch;patch=1 \
-           ${RPSRC}/asoc_updates-r1.patch;patch=1 \
-           ${RPSRC}/hx2750_base-r25.patch;patch=1 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 \
+           ${RPSRC}/mtd_fix_chipops_locking-r0.patch;patch=1 \
+           ${RPSRC}/spectrumcs_fix-r0.patch;patch=1 \
+           ${RPSRC}/alsa/asoc-v0.11pre12.patch;patch=1 \
+           ${RPSRC}/asoc_makefile-r1.patch;patch=1 \
+           ${RPSRC}/alsa/asoc_platform_dev_fix-r0.patch;patch=1 \
+           ${RPSRC}/asoc_poodle_morehack-r0.patch;patch=1 \
+           ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
            ${RPSRC}/pxa_keys-r5.patch;patch=1 \
            ${RPSRC}/tsc2101-r12.patch;patch=1 \
-           ${RPSRC}/hx2750_test1-r3.patch;patch=1 \
+           ${RPSRC}/hx2750_test1-r4.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r5.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \
@@ -35,7 +39,7 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
            ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
            ${RPSRC}/poodle_pm-r1.patch;patch=1 \
            ${RPSRC}/pxafb_changeres-r1.patch;patch=1 \
-           ${RPSRC}/poodle_audio-r0.patch;patch=1 \
+           ${RPSRC}/poodle_audio-r1.patch;patch=1 \
            ${RPSRC}/nand_sharpsl_fix-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r4.patch;patch=1 \
@@ -72,27 +76,39 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
 # (Pavel Machek's git tree has updated versions of this?)
 #  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
 
+# These patches are extracted from Pavel Machek's git tree
+# (diff against vanilla kernel)
+SRC_URI_append_collie = "\
+	   ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \
+	   ${DOSRC}/collie/collie-r0.patch;patch=1 \
+	   ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \
+	   ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \
+	   ${DOSRC}/collie/collie-mcp-r0.patch;patch=1 \
+	   ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \
+#	   ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \
+	   "
+
 
 SRC_URI_append_tosa = "\
 	   ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \
 	   ${CHSRC}/tmio-core-r4.patch;patch=1 \
-	   ${CHSRC}/tmio-tc6393-r5.patch;patch=1 \
+	   ${DOSRC}/temp/tmio-tc6393-r6.patch;patch=1 \
 	   ${CHSRC}/tmio-nand-r5.patch;patch=1 \
-	   ${CHSRC}/tmio-ohci-r3.patch;patch=1 \
+	   ${DOSRC}/temp/tmio-ohci-r4.patch;patch=1 \
 	   ${CHSRC}/tmio-fb-r6.patch;patch=1 \
-	   ${DOSRC}/tosa-keyboard-r14.patch;patch=1 \
+	   ${DOSRC}/tosa-keyboard-r17.patch;patch=1 \
 	   ${DOSRC}/tosa-pxaac97-r6.patch;patch=1 \
 	   ${DOSRC}/tosa-tmio-r6.patch;patch=1 \
-	   ${DOSRC}/tosa-power-r15.patch;patch=1 \
-	   ${DOSRC}/tosa-tmio-lcd-r7.patch;patch=1 \
-	   ${DOSRC}/tosa-bluetooth-r6.patch;patch=1 \
+	   ${DOSRC}/tosa-power-r17.patch;patch=1 \
+	   ${DOSRC}/tosa-tmio-lcd-r8.patch;patch=1 \
+	   ${DOSRC}/tosa-bluetooth-r8.patch;patch=1 \
 	   ${DOSRC}/wm97xx-lg7-r0.patch;patch=1 \
-	   ${DOSRC}/wm9712-suspend-cold-res-r0.patch;patch=1 \
+	   ${DOSRC}/wm9712-suspend-cold-res-r1.patch;patch=1 \
 	   ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \
 	   ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \
 	   ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \
-	   ${DOSRC}/wm9712-reset-loop-r0.patch;patch=1 \
-	   ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
+	   ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1"
+#	   ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index 950f9fd787..ef03c0e434 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r16"
+PR = "r21"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -25,10 +25,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \
            ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=merged \
            ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/spectrumcs_fix-r0.patch;patch=1 \
            file://00-hostap.patch;patch=1;status=merged \
            file://10-pcnet.patch;patch=1;status=merged \
-           ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \
-           ${RPSRC}/asoc_fixes2-r2.patch;patch=1 \
+           ${RPSRC}/alsa/asoc-v0.11pre12.patch;patch=1 \
+           ${RPSRC}/asoc_makefile-r0.patch;patch=1 \
+           ${RPSRC}/alsa/asoc_platform_dev_fix-r0.patch;patch=1 \
+           ${RPSRC}/asoc_poodle_morehack-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -112,7 +115,9 @@ SRC_URI_append_tosa = "\
 	   ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \
 	   ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \
 	   ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \
-	   ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1"
+	   ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1 \
+	   file://tosa-lcdnoise-r0.patch;patch=1 \
+	   file://wm97xx-lcdnoise-r0.patch;patch=1 "
 #	   ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.17"
diff --git a/packages/lsof/lsof_4.74.bb b/packages/lsof/lsof_4.74.bb
deleted file mode 100644
index 0562a57fb1..0000000000
--- a/packages/lsof/lsof_4.74.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "Lsof is a Unix-specific diagnostic \
-tool. Its name stands for LiSt Open Files, and it \
-does just that."
-LICENSE = "BSD"
-
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2"
-LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
-S = "${WORKDIR}/lsof_${PV}_src"
-
-python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)
-	src_uri = bb.data.getVar('SRC_URI', d)
-	bb.data.setVar('SRC_URI', '${LOCALSRC}', d)
-	bb.build.exec_func('base_do_unpack', d)
-	bb.data.setVar('SRC_URI', src_uri, d)
-}
-
-LSOF_OS = "${TARGET_OS}"
-LSOF_OS_linux-uclibc = "linux"
-
-do_configure () {
-	./Configure ${LSOF_OS}
-}
-
-export I = "${STAGING_INCDIR}"
-export L = "${STAGING_INCDIR}"
-export EXTRA_OEMAKE = ""
-
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
-}
-
-do_install () {
-	install -d ${D}${sbindir} ${D}${mandir}/man8
-	install -m 4755 lsof ${D}${sbindir}/lsof
-	install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8
-}
diff --git a/packages/lsof/lsof_4.75.bb b/packages/lsof/lsof_4.76.bb
index 0562a57fb1..d134f38b23 100644
--- a/packages/lsof/lsof_4.75.bb
+++ b/packages/lsof/lsof_4.76.bb
@@ -1,8 +1,8 @@
-SECTION = "console/utils"
-DESCRIPTION = "Lsof is a Unix-specific diagnostic \
-tool. Its name stands for LiSt Open Files, and it \
-does just that."
+DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \
+Its name stands for LiSt Open Files, and it does just that."
+SECTION = "devel"
 LICENSE = "BSD"
+PR = "r0"
 
 SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2"
 LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
@@ -18,6 +18,7 @@ python do_unpack () {
 
 LSOF_OS = "${TARGET_OS}"
 LSOF_OS_linux-uclibc = "linux"
+LSOF_OS_linux-gnueabi = "linux"
 
 do_configure () {
 	./Configure ${LSOF_OS}
diff --git a/packages/ltrace/files/.mtn2git_empty b/packages/ltrace/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ltrace/files/.mtn2git_empty
diff --git a/packages/ltrace/files/mvc-toolchain.patch b/packages/ltrace/files/mvc-toolchain.patch
new file mode 100644
index 0000000000..886759dfbf
--- /dev/null
+++ b/packages/ltrace/files/mvc-toolchain.patch
@@ -0,0 +1,32 @@
+diff -ru ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/arch.h
+--- ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h	2004-11-09 20:25:15.000000000 +0800
++++ ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/arch.h	2005-12-17 02:00:34.000000000 +0800
+@@ -1,4 +1,5 @@
+-#define BREAKPOINT_VALUE { 0x01, 0x00, 0x9f, 0xef }
++#define BREAKPOINT_VALUE { 0xfe, 0xde, 0xff, 0xe7}
++
+ #define BREAKPOINT_LENGTH 4
+ #define DECR_PC_AFTER_BREAK 0
+ 
+diff -ru ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/plt.c
+--- ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c	2004-11-09 20:25:15.000000000 +0800
++++ ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/plt.c	2005-12-19 08:08:54.000000000 +0800
+@@ -5,5 +5,5 @@
+ GElf_Addr
+ arch_plt_sym_val (struct ltelf *lte, size_t ndx, GElf_Rela *rela)
+ {
+-  return lte->plt_addr + 20 + ndx * 12;
++  return lte->plt_addr + 16 + ndx * 16;
+ }
+diff -ru ltrace-0.3.36/wait_for_something.c ltrace-0.3.36-mvc/wait_for_something.c
+--- ltrace-0.3.36/wait_for_something.c	2004-06-14 23:55:50.000000000 +0800
++++ ltrace-0.3.36-mvc/wait_for_something.c	2005-12-17 02:21:15.000000000 +0800
+@@ -82,7 +82,7 @@
+ 		event.thing = LT_EV_UNKNOWN;
+ 		return &event;
+ 	}
+-	if (WSTOPSIG(status) != SIGTRAP) {
++	if (WSTOPSIG(status) != SIGTRAP && WSTOPSIG(status) != SIGILL) {
+ 		event.thing = LT_EV_SIGNAL;
+ 		event.e_un.signum = WSTOPSIG(status);
+ 		return &event;
diff --git a/packages/ltrace/ltrace-mvc_0.3.36.bb b/packages/ltrace/ltrace-mvc_0.3.36.bb
new file mode 100644
index 0000000000..66a613fe2e
--- /dev/null
+++ b/packages/ltrace/ltrace-mvc_0.3.36.bb
@@ -0,0 +1,5 @@
+require ltrace_${PV}.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://mvc-toolchain.patch;patch=1"
diff --git a/packages/ltrace/ltrace_0.3.36.bb b/packages/ltrace/ltrace_0.3.36.bb
index ae2c865f72..1e2ff5394b 100644
--- a/packages/ltrace/ltrace_0.3.36.bb
+++ b/packages/ltrace/ltrace_0.3.36.bb
@@ -3,12 +3,10 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html"
 SECTION = "devel"
 DEPENDS = "libelf"
 LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz\
-           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1\
-	   file://mvc-toolchain.patch;patch=1"
+PR = "r2"
 
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz \
+           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1"
 inherit autotools
 
 PARALLEL_MAKE = ""
@@ -20,6 +18,10 @@ EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
 
 export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
 
+do_configure_prepend() {
+	ln -sf ./linux-gnu sysdeps/linux-gnueabi
+}
+
 do_compile() {
 	oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE}
 }
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
index aca9331e00..6e9a99144b 100644
--- a/packages/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -25,6 +25,7 @@ do_configure() {
 	sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
 	sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
 	sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+	sed -i s:\$\(CC\):gcc:g  ../src/mesa/x86/Makefile
 	echo "SRC_DIRS = mesa glu glut/glx" >> current
 }
 
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index f182086352..bd0322334d 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -1,9 +1,18 @@
 SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
 PACKAGES =+ "firefox-inspector"
 
-FILES_firefox-inspector = "${libdir}/firefox-${PV}/chrome/inspector"
-FILES_${PN} = "${bindir}/firefox ${datadir}/applications ${datadir}/pixmaps ${libdir}/firefox-${PV} ${bindir}/defaults"
+FILES_firefox-inspector = "	${libdir}/firefox-${PV}/chrome/inspector* \
+				${libdir}/firefox-${PV}/components/*nspector* \
+				${libdir}/firefox-${PV}/extensions/inspector* \
+				${libdir}/firefox-${PV}/defaults/preferences/inspector* \
+				"
+FILES_${PN} = "${bindir}/firefox ${datadir}/applications/ ${datadir}/pixmaps/ ${libdir}/firefox-${PV}/* ${bindir}/defaults"
 FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config"
+FILES_${PN}-dbg += "	${libdir}/firefox-${PV}/.debug \
+			${libdir}/firefox-${PV}/*/.debug \
+			${libdir}/firefox-${PV}/*/*/*/.debug \
+			${bindir}/.debug \
+			"
 
 do_install() {
 	oe_runmake DESTDIR="${D}" destdir="${D}" install
diff --git a/packages/mozilla/firefox_1.5.0.6.bb b/packages/mozilla/firefox_1.5.0.6.bb
index 8f888db5ca..5f21212bd5 100644
--- a/packages/mozilla/firefox_1.5.0.6.bb
+++ b/packages/mozilla/firefox_1.5.0.6.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
diff --git a/packages/mozilla/thunderbird_1.0.7.bb b/packages/mozilla/thunderbird_1.0.7.bb
index c3370c6f28..3527ebe93b 100644
--- a/packages/mozilla/thunderbird_1.0.7.bb
+++ b/packages/mozilla/thunderbird_1.0.7.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/utils"
 DEPENDS += "gnupg"
 RRECOMMENDS += "gnupg"
-PR = "r0"
+PR = "r1"
 
 EMVER="0.92.0"
 IPCVER="1.1.3"
@@ -15,7 +15,8 @@ http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz \
 	file://mozilla-thunderbird.png file://mozilla-thunderbird.desktop"
 S = "${WORKDIR}/mozilla"
 
-FILES_${PN} += "${libdir}/thunderbird-${PV} ${datadir}/idl"
+FILES_${PN} += "${libdir}/thunderbird-${PV}/* ${datadir}/idl"
+FILES_${PN}-dbg += "${libdir}/thunderbird-${PV}/.debug*"
 
 inherit mozilla
 
diff --git a/packages/networkmanager/.mtn2git_empty b/packages/networkmanager/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/networkmanager/.mtn2git_empty
diff --git a/packages/networkmanager/files/.mtn2git_empty b/packages/networkmanager/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/networkmanager/files/.mtn2git_empty
diff --git a/packages/networkmanager/files/99_networkmanager b/packages/networkmanager/files/99_networkmanager
new file mode 100644
index 0000000000..b3e7f94657
--- /dev/null
+++ b/packages/networkmanager/files/99_networkmanager
@@ -0,0 +1 @@
+d root root 0700 /var/run/NetworkManager
diff --git a/packages/networkmanager/files/NetworkManager b/packages/networkmanager/files/NetworkManager
new file mode 100755
index 0000000000..0beff63081
--- /dev/null
+++ b/packages/networkmanager/files/NetworkManager
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# NetworkManager startup script
+
+. /etc/profile
+
+case $1 in
+  'start')
+    echo -n "Starting NetworkManager daemon: NetworkManager"
+    /usr/sbin/NetworkManager 
+    echo "."
+  ;;
+
+  'stop')
+    echo -n "Stopping NetworkManager daemon: NetworkManager"
+    kill `ps |grep  /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
+    echo "."
+  ;;
+
+  'restart')
+    $0 stop
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: $0 { start | stop | restart }"
+  ;;
+esac
diff --git a/packages/networkmanager/files/dbus-api-fix.patch b/packages/networkmanager/files/dbus-api-fix.patch
new file mode 100644
index 0000000000..64e60f961b
--- /dev/null
+++ b/packages/networkmanager/files/dbus-api-fix.patch
@@ -0,0 +1,20 @@
+--- /tmp/libnm_glib.c	2006-08-24 22:21:01.000000000 +0200
++++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-08-24 22:21:47.888306000 +0200
+@@ -230,7 +230,7 @@
+ 	{
+ 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
+ 		ctx->nm_state = LIBNM_NO_DBUS;
+-		dbus_connection_disconnect (ctx->dbus_con);
++		dbus_connection_close (ctx->dbus_con);
+ 		libnm_glib_schedule_dbus_watcher (ctx);
+ 	}
+ 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
+@@ -444,7 +444,7 @@
+ 		g_main_loop_unref (ctx->g_main_loop);
+ 
+ 	if (ctx->dbus_con)
+-		dbus_connection_disconnect (ctx->dbus_con);
++		dbus_connection_close (ctx->dbus_con);
+ 
+ 	if (ctx->callbacks_lock)
+ 		g_mutex_free (ctx->callbacks_lock);
diff --git a/packages/networkmanager/files/nm-applet.desktop b/packages/networkmanager/files/nm-applet.desktop
new file mode 100644
index 0000000000..3d99df5cfe
--- /dev/null
+++ b/packages/networkmanager/files/nm-applet.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Network Manager
+Comment=NetworkManager control applet
+Exec=nm-applet
+Type=PanelApp
+Icon=none
+Categories=Panel;Utility;
+
diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
new file mode 100644
index 0000000000..e9c02ba3dd
--- /dev/null
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "GNOME NetworkManager port"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+MAINTAINER = "Milan Plzik <mmp@handhelds.org>"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
+RDEPENDS = "wpa-supplicant dhcdbd gnome-keyring hicolor-icon-theme"
+
+PR = "r1"
+
+SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
+	file://dbus-api-fix.patch;patch=1 \
+	file://99_networkmanager \
+	file://NetworkManager \
+	file://nm-applet.desktop"
+
+EXTRA_OECONF = " \
+		--without-gnome \
+		--with-gpe \
+		--with-distro=debian \
+		--without-gcrypt \
+ 		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
+		--disable-hal  \
+		--with-dhcdbd=/sbin/dhcdbd"
+
+S = ${WORKDIR}/NetworkManager-${PV}
+
+inherit autotools
+
+do_staging () {
+	autotools_stage_includes
+	oe_libinstall -C libnm-util libnm-util ${STAGING_LIBDIR}
+	oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
+	oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
+
+	oe_runmake -C src DESTDIR="${D}" install
+	oe_runmake -C gnome/applet DESTDIR="${D}" install
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/init.d/
+	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+	install -d ${D}/${datadir}/
+	install -m 0755 ${WORKDIR}/nm-applet.desktop ${D}/${datadir}/
+}
+
+
+FILES_${PN} += "${datadir} \
+		${libdir}/*.so* \
+		${libdir}/*.la \
+		${sbindir} \
+             	${bindir} \
+		${sysconfdir} \
+		${libexecdir}"
+
+FILES_${PN}-dev = "${incdir} \
+		   ${libdir}/*.a \
+		   ${libdir}/pkgconfig"
+
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 17bc5a6f9f..4f5e64b352 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "userspace utilities for kernel nfs"
 PRIORITY = "optional"
-SECTION = "console/networking"
+SECTION = "console/network"
 MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://acinclude-lossage.patch;patch=1 \
diff --git a/packages/omniorb/files/long_double.patch b/packages/omniorb/files/long_double.patch
new file mode 100644
index 0000000000..a34ff9807e
--- /dev/null
+++ b/packages/omniorb/files/long_double.patch
@@ -0,0 +1,19 @@
+*** omniORB-4.0.7.old/include/omniORB4/CORBA_sysdep_auto.h	2004-10-17 16:14:28.000000000 -0400
+--- omniORB-4.0.7/include/omniORB4/CORBA_sysdep_auto.h	2006-08-29 11:29:08.000000000 -0400
+***************
+*** 85,91 ****
+  #endif
+  
+  
+! #if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 16)
+  #  define HAS_LongDouble
+  #  define _CORBA_LONGDOUBLE_DECL long double
+  #endif
+--- 85,91 ----
+  #endif
+  
+  
+! #if defined(SIZEOF_LONG_DOUBLE)
+  #  define HAS_LongDouble
+  #  define _CORBA_LONGDOUBLE_DECL long double
+  #endif
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
new file mode 100644
index 0000000000..f9addd997d
--- /dev/null
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -0,0 +1,21 @@
+PR = "r0"
+SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz"
+SECTION = "devel"
+S = "${WORKDIR}/omniORB-${PV}"
+
+DEPENDS += python-native
+
+inherit native autotools
+
+do_compile () {
+	oe_runmake
+}
+
+
+#do_stage() {
+#	install -m 0755 src/bison ${STAGING_BINDIR}/
+#	ln -sf ./bison ${STAGING_BINDIR}/yacc
+#	install -d ${STAGING_BINDIR}/../share/bison/m4sugar
+#	install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_BINDIR}/../share/bison/
+#	install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_BINDIR}/../share/bison/m4sugar/
+#}
diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb
new file mode 100644
index 0000000000..0ef6bdac03
--- /dev/null
+++ b/packages/omniorb/omniorb_4.0.7.bb
@@ -0,0 +1,37 @@
+PR = "r0"
+DESCRIPTION = "OmniORB High Performance ORB"
+SECTION = "devel"
+PRIORITY = "optional"
+MAINTAINER = "Philip Balister <philip@balister.org>"
+LICENSE = "LGPL"
+
+DEPENDS = omniorb-native
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \
+file://omniORB-cross.patch;patch=1 \
+file://omniORB_embedded_appl.patch;patch=1" \
+file://long_double.patch;patch=1"
+
+S = "${WORKDIR}/omniORB-${PV}"
+
+inherit autotools pkgconfig
+
+#do_configure () {
+#	oe_runconf
+#}
+
+do_compile () {
+	export EmbeddedSystem=1
+	export TOOLBINDIR=${STAGING_BINDIR}
+	oe_runmake
+}
+
+do_stage () {
+	export EmbeddedSystem=1
+	make DESTDIR=${STAGING_DIR}/${TARGET_SYS} install
+}
+
+do_install () {
+	export EmbeddedSystem=1
+	make DESTDIR=${D} install
+}
diff --git a/packages/pango/pango-1.13.3/.mtn2git_empty b/packages/pango/pango-1.13.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pango/pango-1.13.3/.mtn2git_empty
diff --git a/packages/pango/pango-1.13.2/opentype-makefile.patch b/packages/pango/pango-1.13.3/opentype-makefile.patch
index 9f68420bc5..9f68420bc5 100644
--- a/packages/pango/pango-1.13.2/opentype-makefile.patch
+++ b/packages/pango/pango-1.13.3/opentype-makefile.patch
diff --git a/packages/pango/pango-1.2.5/ft2.patch b/packages/pango/pango-1.2.5/ft2.patch
deleted file mode 100644
index 5015c8b132..0000000000
--- a/packages/pango/pango-1.2.5/ft2.patch
+++ /dev/null
@@ -1,391 +0,0 @@
---- pango-1.2.5/modules/indic/indic-ot.h	Fri Aug  8 12:05:01 2003
-+++ pango-1.2.5-new/modules/indic/indic-ot.h	Thu Dec 18 14:38:44 2003
-@@ -9,7 +9,8 @@
- #ifndef __INDIC_OT_H__
- #define __INDIC_OT_H__
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <pango/pango-glyph.h>
- #include <pango/pango-types.h>
- #include "mprefixups.h"
---- pango-1.2.5/pango/opentype/ftxopen.h	Fri Aug  8 12:05:10 2003
-+++ pango-1.2.5-new/pango/opentype/ftxopen.h	Thu Dec 18 14:38:41 2003
-@@ -22,7 +22,8 @@
- #ifndef FTXOPEN_H
- #define FTXOPEN_H
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #ifdef __cplusplus
- extern "C" {
---- pango-1.2.5/pango/opentype/pango-ot-info.c	Wed Apr 16 16:48:20 2003
-+++ pango-1.2.5-new/pango/opentype/pango-ot-info.c	Thu Dec 18 13:48:40 2003
-@@ -21,8 +21,9 @@
- 
- #include "pango-ot-private.h"
- #include "fterrcompat.h"
-+
- #include <freetype/internal/ftobjs.h>
--#include <freetype/ftmodule.h>
-+//#include <freetype/config/ftmodule.h>
- 
- static void pango_ot_info_class_init (GObjectClass *object_class);
- static void pango_ot_info_finalize   (GObject *object);
---- pango-1.2.5/pango/opentype/pango-ot-private.h	Tue Dec 19 22:41:36 2000
-+++ pango-1.2.5-new/pango/opentype/pango-ot-private.h	Wed Dec 17 20:53:02 2003
-@@ -22,7 +22,8 @@
- #ifndef __PANGO_OT_PRIVATE_H__
- #define __PANGO_OT_PRIVATE_H__
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #include <glib-object.h>
- 
---- pango-1.2.5/pango/pango-enum-types.c	Thu Jul 24 14:12:13 2003
-+++ pango-1.2.5-new/pango/pango-enum-types.c	Wed Dec 31 18:00:00 1969
-@@ -1,236 +0,0 @@
--
--/* Generated data (by glib-mkenums) */
--
--#include <pango.h>
--
--/* enumerations from "pango-attributes.h" */
--GType
--pango_attr_type_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_ATTR_INVALID, "PANGO_ATTR_INVALID", "invalid" },
--      { PANGO_ATTR_LANGUAGE, "PANGO_ATTR_LANGUAGE", "language" },
--      { PANGO_ATTR_FAMILY, "PANGO_ATTR_FAMILY", "family" },
--      { PANGO_ATTR_STYLE, "PANGO_ATTR_STYLE", "style" },
--      { PANGO_ATTR_WEIGHT, "PANGO_ATTR_WEIGHT", "weight" },
--      { PANGO_ATTR_VARIANT, "PANGO_ATTR_VARIANT", "variant" },
--      { PANGO_ATTR_STRETCH, "PANGO_ATTR_STRETCH", "stretch" },
--      { PANGO_ATTR_SIZE, "PANGO_ATTR_SIZE", "size" },
--      { PANGO_ATTR_FONT_DESC, "PANGO_ATTR_FONT_DESC", "font-desc" },
--      { PANGO_ATTR_FOREGROUND, "PANGO_ATTR_FOREGROUND", "foreground" },
--      { PANGO_ATTR_BACKGROUND, "PANGO_ATTR_BACKGROUND", "background" },
--      { PANGO_ATTR_UNDERLINE, "PANGO_ATTR_UNDERLINE", "underline" },
--      { PANGO_ATTR_STRIKETHROUGH, "PANGO_ATTR_STRIKETHROUGH", "strikethrough" },
--      { PANGO_ATTR_RISE, "PANGO_ATTR_RISE", "rise" },
--      { PANGO_ATTR_SHAPE, "PANGO_ATTR_SHAPE", "shape" },
--      { PANGO_ATTR_SCALE, "PANGO_ATTR_SCALE", "scale" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoAttrType", values);
--  }
--  return etype;
--}
--
--GType
--pango_underline_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_UNDERLINE_NONE, "PANGO_UNDERLINE_NONE", "none" },
--      { PANGO_UNDERLINE_SINGLE, "PANGO_UNDERLINE_SINGLE", "single" },
--      { PANGO_UNDERLINE_DOUBLE, "PANGO_UNDERLINE_DOUBLE", "double" },
--      { PANGO_UNDERLINE_LOW, "PANGO_UNDERLINE_LOW", "low" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoUnderline", values);
--  }
--  return etype;
--}
--
--
--/* enumerations from "pango-coverage.h" */
--GType
--pango_coverage_level_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_COVERAGE_NONE, "PANGO_COVERAGE_NONE", "none" },
--      { PANGO_COVERAGE_FALLBACK, "PANGO_COVERAGE_FALLBACK", "fallback" },
--      { PANGO_COVERAGE_APPROXIMATE, "PANGO_COVERAGE_APPROXIMATE", "approximate" },
--      { PANGO_COVERAGE_EXACT, "PANGO_COVERAGE_EXACT", "exact" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoCoverageLevel", values);
--  }
--  return etype;
--}
--
--
--/* enumerations from "pango-font.h" */
--GType
--pango_style_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_STYLE_NORMAL, "PANGO_STYLE_NORMAL", "normal" },
--      { PANGO_STYLE_OBLIQUE, "PANGO_STYLE_OBLIQUE", "oblique" },
--      { PANGO_STYLE_ITALIC, "PANGO_STYLE_ITALIC", "italic" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoStyle", values);
--  }
--  return etype;
--}
--
--GType
--pango_variant_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_VARIANT_NORMAL, "PANGO_VARIANT_NORMAL", "normal" },
--      { PANGO_VARIANT_SMALL_CAPS, "PANGO_VARIANT_SMALL_CAPS", "small-caps" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoVariant", values);
--  }
--  return etype;
--}
--
--GType
--pango_weight_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_WEIGHT_ULTRALIGHT, "PANGO_WEIGHT_ULTRALIGHT", "ultralight" },
--      { PANGO_WEIGHT_LIGHT, "PANGO_WEIGHT_LIGHT", "light" },
--      { PANGO_WEIGHT_NORMAL, "PANGO_WEIGHT_NORMAL", "normal" },
--      { PANGO_WEIGHT_BOLD, "PANGO_WEIGHT_BOLD", "bold" },
--      { PANGO_WEIGHT_ULTRABOLD, "PANGO_WEIGHT_ULTRABOLD", "ultrabold" },
--      { PANGO_WEIGHT_HEAVY, "PANGO_WEIGHT_HEAVY", "heavy" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoWeight", values);
--  }
--  return etype;
--}
--
--GType
--pango_stretch_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_STRETCH_ULTRA_CONDENSED, "PANGO_STRETCH_ULTRA_CONDENSED", "ultra-condensed" },
--      { PANGO_STRETCH_EXTRA_CONDENSED, "PANGO_STRETCH_EXTRA_CONDENSED", "extra-condensed" },
--      { PANGO_STRETCH_CONDENSED, "PANGO_STRETCH_CONDENSED", "condensed" },
--      { PANGO_STRETCH_SEMI_CONDENSED, "PANGO_STRETCH_SEMI_CONDENSED", "semi-condensed" },
--      { PANGO_STRETCH_NORMAL, "PANGO_STRETCH_NORMAL", "normal" },
--      { PANGO_STRETCH_SEMI_EXPANDED, "PANGO_STRETCH_SEMI_EXPANDED", "semi-expanded" },
--      { PANGO_STRETCH_EXPANDED, "PANGO_STRETCH_EXPANDED", "expanded" },
--      { PANGO_STRETCH_EXTRA_EXPANDED, "PANGO_STRETCH_EXTRA_EXPANDED", "extra-expanded" },
--      { PANGO_STRETCH_ULTRA_EXPANDED, "PANGO_STRETCH_ULTRA_EXPANDED", "ultra-expanded" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoStretch", values);
--  }
--  return etype;
--}
--
--GType
--pango_font_mask_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GFlagsValue values[] = {
--      { PANGO_FONT_MASK_FAMILY, "PANGO_FONT_MASK_FAMILY", "family" },
--      { PANGO_FONT_MASK_STYLE, "PANGO_FONT_MASK_STYLE", "style" },
--      { PANGO_FONT_MASK_VARIANT, "PANGO_FONT_MASK_VARIANT", "variant" },
--      { PANGO_FONT_MASK_WEIGHT, "PANGO_FONT_MASK_WEIGHT", "weight" },
--      { PANGO_FONT_MASK_STRETCH, "PANGO_FONT_MASK_STRETCH", "stretch" },
--      { PANGO_FONT_MASK_SIZE, "PANGO_FONT_MASK_SIZE", "size" },
--      { 0, NULL, NULL }
--    };
--    etype = g_flags_register_static ("PangoFontMask", values);
--  }
--  return etype;
--}
--
--
--/* enumerations from "pango-layout.h" */
--GType
--pango_alignment_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_ALIGN_LEFT, "PANGO_ALIGN_LEFT", "left" },
--      { PANGO_ALIGN_CENTER, "PANGO_ALIGN_CENTER", "center" },
--      { PANGO_ALIGN_RIGHT, "PANGO_ALIGN_RIGHT", "right" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoAlignment", values);
--  }
--  return etype;
--}
--
--GType
--pango_wrap_mode_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_WRAP_WORD, "PANGO_WRAP_WORD", "word" },
--      { PANGO_WRAP_CHAR, "PANGO_WRAP_CHAR", "char" },
--      { PANGO_WRAP_WORD_CHAR, "PANGO_WRAP_WORD_CHAR", "word-char" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoWrapMode", values);
--  }
--  return etype;
--}
--
--
--/* enumerations from "pango-tabs.h" */
--GType
--pango_tab_align_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_TAB_LEFT, "PANGO_TAB_LEFT", "left" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoTabAlign", values);
--  }
--  return etype;
--}
--
--
--/* enumerations from "pango-types.h" */
--GType
--pango_direction_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_DIRECTION_LTR, "PANGO_DIRECTION_LTR", "ltr" },
--      { PANGO_DIRECTION_RTL, "PANGO_DIRECTION_RTL", "rtl" },
--      { PANGO_DIRECTION_TTB_LTR, "PANGO_DIRECTION_TTB_LTR", "ttb-ltr" },
--      { PANGO_DIRECTION_TTB_RTL, "PANGO_DIRECTION_TTB_RTL", "ttb-rtl" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static ("PangoDirection", values);
--  }
--  return etype;
--}
--
--
--/* Generated data ends here */
--
---- pango-1.2.5/pango/pango-enum-types.h	Thu Jul 24 14:11:58 2003
-+++ pango-1.2.5-new/pango/pango-enum-types.h	Wed Dec 31 18:00:00 1969
-@@ -1,64 +0,0 @@
--
--/* Generated data (by glib-mkenums) */
--
--#ifndef __PANGO_ENUM_TYPES_H__
--#define __PANGO_ENUM_TYPES_H__
--
--#include <glib-object.h>
--
--G_BEGIN_DECLS
--
--/* enumerations from "pango-attributes.h" */
--
--GType pango_attr_type_get_type (void);
--#define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
--
--GType pango_underline_get_type (void);
--#define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
--
--/* enumerations from "pango-coverage.h" */
--
--GType pango_coverage_level_get_type (void);
--#define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
--
--/* enumerations from "pango-font.h" */
--
--GType pango_style_get_type (void);
--#define PANGO_TYPE_STYLE (pango_style_get_type())
--
--GType pango_variant_get_type (void);
--#define PANGO_TYPE_VARIANT (pango_variant_get_type())
--
--GType pango_weight_get_type (void);
--#define PANGO_TYPE_WEIGHT (pango_weight_get_type())
--
--GType pango_stretch_get_type (void);
--#define PANGO_TYPE_STRETCH (pango_stretch_get_type())
--
--GType pango_font_mask_get_type (void);
--#define PANGO_TYPE_FONT_MASK (pango_font_mask_get_type())
--
--/* enumerations from "pango-layout.h" */
--
--GType pango_alignment_get_type (void);
--#define PANGO_TYPE_ALIGNMENT (pango_alignment_get_type())
--
--GType pango_wrap_mode_get_type (void);
--#define PANGO_TYPE_WRAP_MODE (pango_wrap_mode_get_type())
--
--/* enumerations from "pango-tabs.h" */
--
--GType pango_tab_align_get_type (void);
--#define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
--
--/* enumerations from "pango-types.h" */
--
--GType pango_direction_get_type (void);
--#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
--
--G_END_DECLS
--
--#endif /* __PANGO_ENUM_TYPES_H__ */
--
--/* Generated data ends here */
--
---- pango-1.2.5/pango/pango-ot.h	Mon Jun  3 19:20:47 2002
-+++ pango-1.2.5-new/pango/pango-ot.h	Thu Dec 18 14:37:56 2003
-@@ -22,7 +22,8 @@
- #ifndef __PANGO_OT_H__
- #define __PANGO_OT_H__
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <pango/pango-glyph.h>
- 
- G_BEGIN_DECLS
---- pango-1.2.5/pango/pangoft2.c	Fri Aug  8 12:05:05 2003
-+++ pango-1.2.5-new/pango/pangoft2.c	Thu Dec 18 14:34:50 2003
-@@ -28,7 +28,8 @@
- #include <glib.h>
- #include <glib/gprintf.h>
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #include "pango-utils.h"
- #include "pangoft2.h"
---- pango-1.2.5/pango/pangoft2.h	Wed Jul  3 17:30:36 2002
-+++ pango-1.2.5-new/pango/pangoft2.h	Thu Dec 18 14:36:12 2003
-@@ -23,7 +23,8 @@
- #ifndef __PANGOFT2_H__
- #define __PANGOFT2_H__
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #include <fontconfig/fontconfig.h>
- 
diff --git a/packages/pango/pango-1.2.5/m4.patch b/packages/pango/pango-1.2.5/m4.patch
deleted file mode 100644
index ec92211199..0000000000
--- a/packages/pango/pango-1.2.5/m4.patch
+++ /dev/null
@@ -1,502 +0,0 @@
---- /dev/null
-+++ pango-1.2.5/m4/glib-2.0.m4
-@@ -0,0 +1,212 @@
-+# Configure paths for GLIB
-+# Owen Taylor     1997-2001
-+
-+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-+dnl gthread is specified in MODULES, pass to pkg-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB_2_0,
-+[dnl 
-+dnl Get the cflags and libraries from pkg-config
-+dnl
-+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-+		    , enable_glibtest=yes)
-+
-+  pkg_config_args=glib-2.0
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gmodule) 
-+             pkg_config_args="$pkg_config_args gmodule-2.0"
-+         ;;
-+         gobject) 
-+             pkg_config_args="$pkg_config_args gobject-2.0"
-+         ;;
-+         gthread) 
-+             pkg_config_args="$pkg_config_args gthread-2.0"
-+         ;;
-+      esac
-+  done
-+
-+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
-+  no_glib=""
-+
-+  if test x$PKG_CONFIG != xno ; then
-+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-+      :
-+    else
-+      echo *** pkg-config too old; version 0.7 or better required.
-+      no_glib=yes
-+      PKG_CONFIG=no
-+    fi
-+  else
-+    no_glib=yes
-+  fi
-+
-+  min_glib_version=ifelse([$1], ,2.0.0,$1)
-+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+
-+  if test x$PKG_CONFIG != xno ; then
-+    ## don't try to run the test against uninstalled libtool libs
-+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-+	  enable_glibtest=no
-+    fi
-+
-+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-+	  :
-+    else
-+	  no_glib=yes
-+    fi
-+  fi
-+
-+  if test x"$no_glib" = x ; then
-+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+
-+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_glibtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+      LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of pkg-config to some extent)
-+dnl
-+      rm -f conf.glibtest
-+      AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.glibtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_glib_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_glib_version");
-+     exit(1);
-+   }
-+
-+  if ((glib_major_version != $glib_config_major_version) ||
-+      (glib_minor_version != $glib_config_minor_version) ||
-+      (glib_micro_version != $glib_config_micro_version))
-+    {
-+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+             glib_major_version, glib_minor_version, glib_micro_version);
-+      printf ("*** was found! If pkg-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-+      printf("*** to point to the correct configuration files\n");
-+    } 
-+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-+           (glib_micro_version != GLIB_MICRO_VERSION))
-+    {
-+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     glib_major_version, glib_minor_version, glib_micro_version);
-+    }
-+  else
-+    {
-+      if ((glib_major_version > major) ||
-+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+               glib_major_version, glib_minor_version, glib_micro_version);
-+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_glib" = x ; then
-+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$PKG_CONFIG" = "no" ; then
-+       echo "*** A new enough version of pkg-config was not found."
-+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-+     else
-+       if test -f conf.glibtest ; then
-+        :
-+       else
-+          echo "*** Could not run GLIB test program, checking why..."
-+          ac_save_CFLAGS="$CFLAGS"
-+          ac_save_LIBS="$LIBS"
-+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+          LIBS="$LIBS $GLIB_LIBS"
-+          AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GLIB_CFLAGS=""
-+     GLIB_LIBS=""
-+     GLIB_GENMARSHAL=""
-+     GOBJECT_QUERY=""
-+     GLIB_MKENUMS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  AC_SUBST(GLIB_GENMARSHAL)
-+  AC_SUBST(GOBJECT_QUERY)
-+  AC_SUBST(GLIB_MKENUMS)
-+  rm -f conf.glibtest
-+])
---- /dev/null
-+++ pango-1.2.5/m4/glib-gettext.m4
-@@ -0,0 +1,284 @@
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-+#
-+# Modified to never use included libintl. 
-+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-+#
-+#
-+# This file can be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+#
-+#
-+# If you make changes to this file, you MUST update the copy in
-+# acinclude.m4. [ aclocal dies on duplicate macros, so if
-+# we run 'aclocal -I macros/' then we'll run into problems
-+# once we've installed glib-gettext.m4 :-( ]
-+#
-+
-+AC_DEFUN([AM_GLIB_LC_MESSAGES],
-+  [if test $ac_cv_header_locale_h = yes; then
-+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+    if test $am_cv_val_LC_MESSAGES = yes; then
-+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+        [Define if your <locale.h> file defines LC_MESSAGES.])
-+    fi
-+  fi])
-+
-+dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
-+
-+# serial 5
-+
-+AC_DEFUN(AM_GLIB_WITH_NLS,
-+  dnl NLS is obligatory
-+  [USE_NLS=yes
-+    AC_SUBST(USE_NLS)
-+
-+    dnl Figure out what method
-+    nls_cv_force_use_gnu_gettext="no"
-+
-+    nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+    if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+      dnl User does not insist on using GNU NLS library.  Figure out what
-+      dnl to use.  If gettext or catgets are available (in this order) we
-+      dnl use this.  Else we have to fall back to GNU NLS library.
-+      dnl catgets is only used if permitted by option --with-catgets.
-+      nls_cv_header_intl=
-+      nls_cv_header_libgt=
-+      CATOBJEXT=NONE
-+      XGETTEXT=:
-+
-+      AC_CHECK_HEADER(libintl.h,
-+        [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+	  [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
-+	    gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
-+
-+          gt_cv_func_dgettext_libintl="no"
-+          libintl_extra_libs=""
-+
-+	  if test "$gt_cv_func_dgettext_libc" != "yes" ; then
-+	    AC_CHECK_LIB(intl, bindtextdomain,
-+              [AC_CHECK_LIB(intl, dgettext,
-+                            gt_cv_func_dgettext_libintl=yes)])
-+
-+	    if test "$gt_cv_func_dgettext_libc" != "yes" ; then
-+              AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+              AC_MSG_RESULT([])
-+              AC_CHECK_LIB(intl, dcgettext,
-+                           [gt_cv_func_dgettext_libintl=yes
-+                            libintl_extra_libs=-liconv],
-+                           :,-liconv)
-+            fi
-+          fi
-+
-+          if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    LIBS="$LIBS -lintl $libintl_extra_libs";
-+          fi
-+
-+	  if test "$gt_cv_func_dgettext_libc" = "yes" \
-+	    || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    AC_DEFINE(HAVE_GETTEXT,1,
-+              [Define if the GNU gettext() function is already present or preinstalled.])
-+	    AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ 	      [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+	    if test "$MSGFMT" != "no"; then
-+	      AC_CHECK_FUNCS(dcgettext)
-+	      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+	      AM_GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+	        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+	      AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+		 	     return _nl_msg_cat_cntr],
-+	        [CATOBJEXT=.gmo
-+	         DATADIRNAME=share],
-+	        [CATOBJEXT=.mo
-+	         DATADIRNAME=lib])
-+	      INSTOBJEXT=.mo
-+	    fi
-+	  fi
-+
-+	  # Added by Martin Baulig 12/15/98 for libc5 systems
-+	  if test "$gt_cv_func_dgettext_libc" != "yes" \
-+	    && test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    INTLLIBS="-lintl $libintl_extra_libs"
-+	    LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-+	  fi
-+      ])
-+
-+      if test "$CATOBJEXT" = "NONE"; then
-+        dnl Neither gettext nor catgets in included in the C library.
-+        dnl Fall back on GNU gettext library.
-+        nls_cv_use_gnu_gettext=yes
-+      fi
-+    fi
-+
-+    if test "$nls_cv_use_gnu_gettext" != "yes"; then
-+      AC_DEFINE(ENABLE_NLS, 1,
-+        [always defined to indicate that i18n is enabled])
-+    else
-+      dnl Unset this variable since we use the non-zero value as a flag.
-+      CATOBJEXT=
-+    fi
-+
-+    dnl Test whether we really found GNU xgettext.
-+    if test "$XGETTEXT" != ":"; then
-+      dnl If it is no GNU xgettext we define it as : so that the
-+      dnl Makefiles still can work.
-+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+        : ;
-+      else
-+        AC_MSG_RESULT(
-+	  [found xgettext program is not GNU xgettext; ignore it])
-+        XGETTEXT=":"
-+      fi
-+    fi
-+
-+    # We need to process the po/ directory.
-+    POSUB=po
-+
-+    AC_OUTPUT_COMMANDS(
-+      [case "$CONFIG_FILES" in *po/Makefile.in*)
-+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+      esac])
-+
-+    dnl These rules are solely for the distribution goal.  While doing this
-+    dnl we only have to keep exactly one list of the available catalogs
-+    dnl in configure.in.
-+    for lang in $ALL_LINGUAS; do
-+      GMOFILES="$GMOFILES $lang.gmo"
-+      POFILES="$POFILES $lang.po"
-+    done
-+
-+    dnl Make all variables we use known to autoconf.
-+    AC_SUBST(CATALOGS)
-+    AC_SUBST(CATOBJEXT)
-+    AC_SUBST(DATADIRNAME)
-+    AC_SUBST(GMOFILES)
-+    AC_SUBST(INSTOBJEXT)
-+    AC_SUBST(INTLDEPS)
-+    AC_SUBST(INTLLIBS)
-+    AC_SUBST(INTLOBJS)
-+    AC_SUBST(POFILES)
-+    AC_SUBST(POSUB)
-+  ])
-+
-+AC_DEFUN(AM_GLIB_GNU_GETTEXT,
-+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+   AC_REQUIRE([AC_PROG_CC])dnl
-+   AC_REQUIRE([AC_PROG_RANLIB])dnl
-+   AC_REQUIRE([AC_HEADER_STDC])dnl
-+   AC_REQUIRE([AC_C_CONST])dnl
-+   AC_REQUIRE([AC_C_INLINE])dnl
-+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+   AC_REQUIRE([AC_FUNC_MMAP])dnl
-+
-+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-+unistd.h sys/param.h])
-+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-+strdup __argz_count __argz_stringify __argz_next])
-+
-+   AM_GLIB_LC_MESSAGES
-+   AM_GLIB_WITH_NLS
-+
-+   if test "x$CATOBJEXT" != "x"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       AC_MSG_CHECKING(for catalogs to be installed)
-+       NEW_LINGUAS=
-+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-+         case "$ALL_LINGUAS" in
-+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+         esac
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       AC_MSG_RESULT($LINGUAS)
-+     fi
-+
-+     dnl Construct list of names of catalog files to be constructed.
-+     if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
-+
-+   dnl Determine which catalog format we have (if any is needed)
-+   dnl For now we know about two different formats:
-+   dnl   Linux libc-5 and the normal X/Open format
-+   test -d po || mkdir po
-+   if test "$CATOBJEXT" = ".cat"; then
-+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-+
-+     dnl Transform the SED scripts while copying because some dumb SEDs
-+     dnl cannot handle comments.
-+     sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed
-+   fi
-+
-+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+   dnl Try to locate is.
-+   MKINSTALLDIRS=
-+   if test -n "$ac_aux_dir"; then
-+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+   fi
-+   if test -z "$MKINSTALLDIRS"; then
-+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+   fi
-+   AC_SUBST(MKINSTALLDIRS)
-+
-+   dnl Generate list of files to be processed by xgettext which will
-+   dnl be included in po/Makefile.
-+   test -d po || mkdir po
-+   if test "x$srcdir" != "x."; then
-+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+       posrcprefix="$srcdir/"
-+     else
-+       posrcprefix="../$srcdir/"
-+     fi
-+   else
-+     posrcprefix="../"
-+   fi
-+   rm -f po/POTFILES
-+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+	< $srcdir/po/POTFILES.in > po/POTFILES
-+  ])
-+
diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb
deleted file mode 100644
index 27d57052f7..0000000000
--- a/packages/pango/pango_1.10.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-PR = "r0"
-
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
-
-# seems to go wrong with default cflags
-FULL_OPTIMIZATION_arm = "-O2"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest \
-		--enable-explicit-deps=no \
-	        --disable-debug"
-
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
-LIBV = "1.4.0"
-
-do_stage () {
-	for lib in pango pangox pangoft2 pangoxft pangocairo; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
-}
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-PACKAGES_DYNAMIC = "pango-module-*"
-
-python populate_packages_prepend () {
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
-
-	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
-}
diff --git a/packages/pango/pango_1.13.2.bb b/packages/pango/pango_1.13.3.bb
index fb2a6a7394..b882365735 100644
--- a/packages/pango/pango_1.13.2.bb
+++ b/packages/pango/pango_1.13.3.bb
@@ -41,6 +41,8 @@ fi
 
 }
 
+PACKAGES_DYNAMIC = "pango-module-*"
+
 python populate_packages_prepend () {
 	prologue = bb.data.getVar("postinst_prologue", d, 1)
 
diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb
index 77eee85214..19fc1d7a92 100644
--- a/packages/pango/pango_1.14.0.bb
+++ b/packages/pango/pango_1.14.0.bb
@@ -7,6 +7,8 @@ Open Source framework for the layout and rendering of \
 internationalized text."
 PR = "r0"
 
+PACKAGES_DYNAMIC = "pango-module-*"
+
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
 # seems to go wrong with default cflags
@@ -26,11 +28,7 @@ FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
 LIBV = "1.5.0"
 
 do_stage () {
-	for lib in pango pangox pangoft2 pangoxft pangocairo; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
+	autotools_stage_all
 }
 
 postinst_prologue() {
diff --git a/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb
deleted file mode 100644
index 5a8e3da345..0000000000
--- a/packages/pango/pango_1.2.5.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt"
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/pango/1.2/pango-${PV}.tar.bz2 \
-	   file://ft2.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://no-tests.patch;patch=1"
-
-inherit autotools  pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest \
-		--enable-explicit-deps=no"
-
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
-LIBV = "1.2.0"
-
-do_stage () {
-	for lib in pango pangox pangoft2 pangoxft; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
-}
-
-PACKAGES_DYNAMIC = "pango-module-*"
-
-python populate_packages_prepend () {
-	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
-
-	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', 'pango-querymodules > /etc/pango/pango.modules')
-}
diff --git a/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb
deleted file mode 100644
index 3f2f664d21..0000000000
--- a/packages/pango/pango_1.4.0.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt"
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/pango-${PV}.tar.bz2 \
-	   file://gtk-doc.patch;patch=1 \
-	   file://no-tests.patch;patch=1"
-
-inherit autotools  pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest \
-		--enable-explicit-deps=no \
-	        --disable-debug"
-
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
-LIBV = "1.4.0"
-
-do_stage () {
-	for lib in pango pangox pangoft2 pangoxft; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
-}
-
-PACKAGES_DYNAMIC = "pango-module-*"
-
-python populate_packages_prepend () {
-	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
-
-	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', 'pango-querymodules > /etc/pango/pango.modules')
-}
diff --git a/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb
deleted file mode 100644
index fe9752c8bd..0000000000
--- a/packages/pango/pango_1.8.0.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc"
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-PR = "r2"
-
-# seems to go wrong with default cflags
-FULL_OPTIMIZATION_arm = "-O2"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest \
-		--enable-explicit-deps=no \
-	        --disable-debug"
-
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
-LIBV = "1.4.0"
-
-do_stage () {
-	for lib in pango pangox pangoft2 pangoxft; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
-}
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-PACKAGES_DYNAMIC = "pango-module-*"
-
-python populate_packages_prepend () {
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
-
-	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
-}
diff --git a/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb
deleted file mode 100644
index fe9752c8bd..0000000000
--- a/packages/pango/pango_1.8.1.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc"
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-PR = "r2"
-
-# seems to go wrong with default cflags
-FULL_OPTIMIZATION_arm = "-O2"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest \
-		--enable-explicit-deps=no \
-	        --disable-debug"
-
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
-LIBV = "1.4.0"
-
-do_stage () {
-	for lib in pango pangox pangoft2 pangoxft; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
-}
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-PACKAGES_DYNAMIC = "pango-module-*"
-
-python populate_packages_prepend () {
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
-
-	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
-}
diff --git a/packages/patch/patch-2.5.9/global-reject-file.diff b/packages/patch/patch-2.5.9/global-reject-file.diff
new file mode 100644
index 0000000000..66065fcbf5
--- /dev/null
+++ b/packages/patch/patch-2.5.9/global-reject-file.diff
@@ -0,0 +1,201 @@
+Index: patch-2.5.9/patch.man
+===================================================================
+--- patch-2.5.9.orig/patch.man
++++ patch-2.5.9/patch.man
+@@ -520,6 +520,15 @@ file.
+ \fB\*=reject\-unified\fP
+ Produce unified reject files. The default is to produce context type reject files.
+ .TP
++.BI \*=global\-reject\-file= rejectfile
++Put all rejects into
++.I rejectfile
++instead of creating separate reject files for all files that have rejects. The
++.I rejectfile
++will contain headers that identify which file each reject refers to. Note that
++the global reject file is created even if \-\-dry\-run is specified (while
++non-global reject files will only be created without \-\-dry\-run).
++.TP
+ \fB\-R\fP  or  \fB\*=reverse\fP
+ Assume that this patch was created with the old and new files swapped.
+ (Yes, I'm afraid that does happen occasionally, human nature being what it
+Index: patch-2.5.9/patch.c
+===================================================================
+--- patch-2.5.9.orig/patch.c
++++ patch-2.5.9/patch.c
+@@ -67,6 +67,7 @@ static bool similar (char const *, size_
+ static bool spew_output (struct outstate *);
+ static char const *make_temp (char);
+ static int numeric_string (char const *, bool, char const *);
++static void reject_header (const char *filename);
+ static void abort_hunk (void);
+ static void cleanup (void);
+ static void get_some_switches (void);
+@@ -98,6 +99,7 @@ static int Argc;
+ static char * const *Argv;
+ 
+ static FILE *rejfp;  /* reject file pointer */
++static char *global_reject;
+ 
+ static char const *patchname;
+ static char *rejname;
+@@ -172,6 +174,10 @@ main (int argc, char **argv)
+     /* Make sure we clean up in case of disaster.  */
+     set_signals (false);
+ 
++    /* initialize global reject file */
++    if (global_reject)
++      init_reject ();
++
+     for (
+ 	open_patch_file (patchname);
+ 	there_is_another_patch();
+@@ -208,8 +214,9 @@ main (int argc, char **argv)
+ 	    init_output (TMPOUTNAME, exclusive, &outstate);
+ 	  }
+ 
+-	/* initialize reject file */
+-	init_reject ();
++	/* initialize per-patch reject file */
++	if (!global_reject)
++	  init_reject ();
+ 
+ 	/* find out where all the lines are */
+ 	if (!skip_rest_of_patch)
+@@ -278,6 +285,8 @@ main (int argc, char **argv)
+ 
+ 	    newwhere = pch_newfirst() + last_offset;
+ 	    if (skip_rest_of_patch) {
++		if (!failed)
++		  reject_header(outname);
+ 		abort_hunk();
+ 		failed++;
+ 		if (verbosity == VERBOSE)
+@@ -292,6 +301,8 @@ main (int argc, char **argv)
+ 		  say ("Patch attempted to create file %s, which already exists.\n",
+ 		       quotearg (inname));
+ 
++		if (!failed)
++		  reject_header(outname);
+ 		abort_hunk();
+ 		failed++;
+ 		if (verbosity != SILENT)
+@@ -299,6 +310,8 @@ main (int argc, char **argv)
+ 		       format_linenum (numbuf, newwhere));
+ 	    }
+ 	    else if (! apply_hunk (&outstate, where)) {
++		if (!failed)
++		  reject_header(outname);
+ 		abort_hunk ();
+ 		failed++;
+ 		if (verbosity != SILENT)
+@@ -332,7 +345,8 @@ main (int argc, char **argv)
+ 		    fclose (outstate.ofp);
+ 		    outstate.ofp = 0;
+ 		  }
+-		fclose (rejfp);
++		if (!global_reject)
++		  fclose (rejfp);
+ 		continue;
+ 	      }
+ 
+@@ -412,13 +426,13 @@ main (int argc, char **argv)
+ 	    }
+       }
+       if (diff_type != ED_DIFF) {
+-	if (fclose (rejfp) != 0)
++	if (!global_reject && fclose (rejfp) != 0)
+ 	    write_fatal ();
+ 	if (failed) {
+ 	    somefailed = true;
+ 	    say ("%d out of %d hunk%s %s", failed, hunk, "s" + (hunk == 1),
+ 		 skip_rest_of_patch ? "ignored" : "FAILED");
+-	    if (outname) {
++	    if (!global_reject && outname) {
+ 		char *rej = rejname;
+ 		if (!rejname) {
+ 		    rej = xmalloc (strlen (outname) + 5);
+@@ -445,6 +459,20 @@ main (int argc, char **argv)
+       }
+       set_signals (true);
+     }
++    if (global_reject)
++      {
++	if (fclose (rejfp) != 0)
++	  write_fatal ();
++	if (somefailed)
++	  {
++	  say (" -- saving rejects to file %s\n", quotearg (global_reject));
++	  /*if (! dry_run)
++	    {*/
++	      move_file (TMPREJNAME, &TMPREJNAME_needs_removal,
++			 global_reject, 0644, false);
++	    /*}*/
++	  }
++      }
+     if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0))
+       write_fatal ();
+     cleanup ();
+@@ -523,6 +551,7 @@ static struct option const longopts[] =
+   {"posix", no_argument, NULL, CHAR_MAX + 7},
+   {"quoting-style", required_argument, NULL, CHAR_MAX + 8},
+   {"unified-reject-files", no_argument, NULL, CHAR_MAX + 9},
++  {"global-reject-file", required_argument, NULL, CHAR_MAX + 10},
+   {NULL, no_argument, NULL, 0}
+ };
+ 
+@@ -582,6 +611,7 @@ static char const *const option_help[] =
+ "  --dry-run  Do not actually change any files; just print what would happen.",
+ "  --posix  Conform to the POSIX standard.",
+ "  --unified-reject-files  Create unified reject files.",
++"  --global-reject-file=file  Put all rejects into one file.",
+ "",
+ "  -d DIR  --directory=DIR  Change the working directory to DIR first.",
+ #if HAVE_SETMODE_DOS
+@@ -784,6 +814,9 @@ get_some_switches (void)
+ 	    case CHAR_MAX + 9:
+ 		unified_reject_files = true;
+ 		break;
++	    case CHAR_MAX + 10:
++		global_reject = savestr (optarg);
++		break;
+ 	    default:
+ 		usage (stderr, 2);
+ 	}
+@@ -933,6 +966,37 @@ locate_hunk (LINENUM fuzz)
+ }
+ 
+ static char *
++format_timestamp (char timebuf[37], bool which)
++{
++  time_t ts = pch_timestamp(which);
++  if (ts != -1)
++    {
++      struct tm *tm = localtime(&ts);
++      strftime(timebuf, 37, "\t%Y-%m-%d %H:%M:%S.000000000 %z", tm);
++    }
++  else
++    timebuf[0] = 0;
++  return timebuf;
++}
++
++/* Write a header in a reject file that combines multiple hunks. */
++static void
++reject_header (const char *outname)
++{
++    char timebuf0[37], timebuf1[37];
++    if (!global_reject)
++      return;
++    if (diff_type == UNI_DIFF)
++	fprintf(rejfp, "--- %s.orig%s\n+++ %s%s\n",
++		outname, format_timestamp(timebuf0, reverse),
++		outname, format_timestamp(timebuf1, !reverse));
++    else
++	fprintf(rejfp, "*** %s.orig%s\n--- %s%s\n",
++		outname, format_timestamp(timebuf0, reverse),
++		outname, format_timestamp(timebuf1, !reverse));
++}
++
++static char *
+ format_linerange (char rangebuf[LINENUM_LENGTH_BOUND*2 + 2],
+ 		  LINENUM first, LINENUM lines)
+ {
diff --git a/packages/patch/patch-2.5.9/unified-reject-files.diff b/packages/patch/patch-2.5.9/unified-reject-files.diff
new file mode 100644
index 0000000000..6bfa00dd75
--- /dev/null
+++ b/packages/patch/patch-2.5.9/unified-reject-files.diff
@@ -0,0 +1,305 @@
+Generate unified diff style reject files. Also include the C function names
+in reject files whenever possible.
+
+	$ cat > f.orig
+	< a() {
+	< 2
+	< 3
+	<
+	< 5
+	< 6
+	< }
+
+	$ sed -e 's/5/5a/' f.orig > f
+	$ diff -U2 -p f.orig f > f.diff
+	$ sed -e 's/5/5a/' -e 's/6/6x/' f.orig > f
+	$ ./patch -F0 -s --no-backup-if-mismatch f --reject-unified < f.diff
+	> 1 out of 1 hunk FAILED -- saving rejects to file f.rej
+
+	$ cat f.rej
+	> @@ -3,5 +3,5 @@ a() {
+	>  3
+	>  
+	> -5
+	> +5a
+	>  6
+	>  }
+
+	$ ./patch -F0 -s --no-backup-if-mismatch f < f.diff
+	> 1 out of 1 hunk FAILED -- saving rejects to file f.rej
+
+	$ cat f.rej
+	> *************** a() {
+	> *** 3,7 ****
+	>   3
+	>   
+	> - 5
+	>   6
+	>   }
+	> --- 3,7 ----
+	>   3
+	>   
+	> + 5a
+	>   6
+	>   }
+
+	$ diff -Nu -p /dev/null f.orig > f2.diff
+	$ ./patch -F0 -s --no-backup-if-mismatch f --reject-unified < f2.diff
+	> Patch attempted to create file f, which already exists.
+	> 1 out of 1 hunk FAILED -- saving rejects to file f.rej
+
+	$ cat f.rej
+	> @@ -0,0 +1,7 @@
+	> +a() {
+	> +2
+	> +3
+	> +
+	> +5
+	> +6
+	> +}
+
+	$ rm -f f f.orig f.rej f.diff f2.diff
+
+Index: patch-2.5.9/pch.c
+===================================================================
+--- patch-2.5.9.orig/pch.c
++++ patch-2.5.9/pch.c
+@@ -68,6 +68,7 @@ static LINENUM p_sline;			/* and the lin
+ static LINENUM p_hunk_beg;		/* line number of current hunk */
+ static LINENUM p_efake = -1;		/* end of faked up lines--don't free */
+ static LINENUM p_bfake = -1;		/* beg of faked up lines */
++static char *p_c_function;		/* the C function a hunk is in */
+ 
+ enum nametype { OLD, NEW, INDEX, NONE };
+ 
+@@ -888,6 +889,19 @@ another_hunk (enum diff difftype, bool r
+ 	    next_intuit_at(line_beginning,p_input_line);
+ 	    return chars_read == (size_t) -1 ? -1 : 0;
+ 	}
++	s = buf;
++	while (*s == '*')
++	    s++;
++	if (*s == ' ')
++	  {
++	    p_c_function = s;
++	    while (*s != '\n')
++		s++;
++	    *s = '\0';
++	    p_c_function = savestr (p_c_function);
++	  }
++	else
++	    p_c_function = NULL;
+ 	p_hunk_beg = p_input_line + 1;
+ 	while (p_end < p_max) {
+ 	    chars_read = get_line ();
+@@ -1277,8 +1291,18 @@ another_hunk (enum diff difftype, bool r
+ 	else
+ 	    p_repl_lines = 1;
+ 	if (*s == ' ') s++;
+-	if (*s != '@')
++	if (*s++ != '@')
+ 	    malformed ();
++	if (*s++ == '@' && *s == ' ' && *s != '\0')
++	  {
++	    p_c_function = s;
++	    while (*s != '\n')
++		s++;
++	    *s = '\0';
++	    p_c_function = savestr (p_c_function);
++	  }
++	else
++	    p_c_function = NULL;
+ 	if (!p_ptrn_lines)
+ 	    p_first++;			/* do append rather than insert */
+ 	if (!p_repl_lines)
+@@ -1884,6 +1908,12 @@ pch_hunk_beg (void)
+     return p_hunk_beg;
+ }
+ 
++char const *
++pch_c_function (void)
++{
++    return p_c_function;
++}
++
+ /* Is the newline-terminated line a valid `ed' command for patch
+    input?  If so, return the command character; if not, return 0.
+    This accepts accepts just a subset of the valid commands, but it's
+Index: patch-2.5.9/pch.h
+===================================================================
+--- patch-2.5.9.orig/pch.h
++++ patch-2.5.9/pch.h
+@@ -25,6 +25,7 @@
+ LINENUM pch_end (void);
+ LINENUM pch_first (void);
+ LINENUM pch_hunk_beg (void);
++char const *pch_c_function (void);
+ LINENUM pch_newfirst (void);
+ LINENUM pch_prefix_context (void);
+ LINENUM pch_ptrn_lines (void);
+Index: patch-2.5.9/patch.man
+===================================================================
+--- patch-2.5.9.orig/patch.man
++++ patch-2.5.9/patch.man
+@@ -517,6 +517,9 @@ instead of the default
+ .B \&.rej
+ file.
+ .TP
++\fB\*=reject\-unified\fP
++Produce unified reject files. The default is to produce context type reject files.
++.TP
+ \fB\-R\fP  or  \fB\*=reverse\fP
+ Assume that this patch was created with the old and new files swapped.
+ (Yes, I'm afraid that does happen occasionally, human nature being what it
+Index: patch-2.5.9/common.h
+===================================================================
+--- patch-2.5.9.orig/common.h
++++ patch-2.5.9/common.h
+@@ -146,6 +146,7 @@ XTERN int invc;
+ XTERN struct stat instat;
+ XTERN bool dry_run;
+ XTERN bool posixly_correct;
++XTERN bool unified_reject_files;
+ 
+ XTERN char const *origprae;
+ XTERN char const *origbase;
+Index: patch-2.5.9/patch.c
+===================================================================
+--- patch-2.5.9.orig/patch.c
++++ patch-2.5.9/patch.c
+@@ -522,6 +522,7 @@ static struct option const longopts[] =
+   {"no-backup-if-mismatch", no_argument, NULL, CHAR_MAX + 6},
+   {"posix", no_argument, NULL, CHAR_MAX + 7},
+   {"quoting-style", required_argument, NULL, CHAR_MAX + 8},
++  {"unified-reject-files", no_argument, NULL, CHAR_MAX + 9},
+   {NULL, no_argument, NULL, 0}
+ };
+ 
+@@ -580,6 +581,7 @@ static char const *const option_help[] =
+ "  --verbose  Output extra information about the work being done.",
+ "  --dry-run  Do not actually change any files; just print what would happen.",
+ "  --posix  Conform to the POSIX standard.",
++"  --unified-reject-files  Create unified reject files.",
+ "",
+ "  -d DIR  --directory=DIR  Change the working directory to DIR first.",
+ #if HAVE_SETMODE_DOS
+@@ -779,6 +781,9 @@ get_some_switches (void)
+ 				     (enum quoting_style) i);
+ 		}
+ 		break;
++	    case CHAR_MAX + 9:
++		unified_reject_files = true;
++		break;
+ 	    default:
+ 		usage (stderr, 2);
+ 	}
+@@ -927,6 +932,24 @@ locate_hunk (LINENUM fuzz)
+     return 0;
+ }
+ 
++static char *
++format_linerange (char rangebuf[LINENUM_LENGTH_BOUND*2 + 2],
++		  LINENUM first, LINENUM lines)
++{
++    if (lines == 1)
++      rangebuf = format_linenum (rangebuf, first);
++    else
++      {
++	char *rb;
++	rangebuf = format_linenum (rangebuf + LINENUM_LENGTH_BOUND + 1, lines);
++	rb = rangebuf-1;
++	rangebuf = format_linenum (rangebuf - LINENUM_LENGTH_BOUND - 1,
++				   (lines > 0) ? first : 0);
++	*rb = ',';
++      }
++    return rangebuf;
++}
++
+ /* We did not find the pattern, dump out the hunk so they can handle it. */
+ 
+ static void
+@@ -943,8 +966,83 @@ abort_hunk (void)
+       (int) NEW_CONTEXT_DIFF <= (int) diff_type ? " ****" : "";
+     char const *minuses =
+       (int) NEW_CONTEXT_DIFF <= (int) diff_type ? " ----" : " -----";
++    char const *function = pch_c_function();
++    if (function == NULL)
++	function = "";
++
++    if (unified_reject_files)
++      {
++	/* produce unified reject files */
++	char rangebuf0[LINENUM_LENGTH_BOUND*2 + 2];
++	char rangebuf1[LINENUM_LENGTH_BOUND*2 + 2];
++	LINENUM j;
++
++	/* Find the beginning of the remove and insert section. */
++	for (j = 0; j <= pat_end; j++)
++	  if (pch_char (j) == '=')
++	    break;
++	for (i = j+1; i <= pat_end; i++)
++	  if (pch_char (i) == '^')
++	    break;
++	if (pch_char (0) != '*' || j > pat_end || i > pat_end+1)
++	  fatal ("internal error in abort_hunk");
++	i = 1; j++;
++
++	/* @@ -from,lines +to,lines @@ */
++	fprintf (rejfp, "@@ -%s +%s @@%s\n",
++		 format_linerange (rangebuf0, oldfirst, pch_ptrn_lines()),
++		 format_linerange (rangebuf1, newfirst, pch_repl_lines()),
++		 function);
++
++	while (   (i <= pat_end && pch_char (i) != '=')
++	       || (j <= pat_end && pch_char (j) != '^'))
++	  {
++	    if (i <= pat_end
++		&& (pch_char (i) == '-' || pch_char (i) == '!'))
++	      {
++		fputc('-', rejfp);
++		pch_write_line (i++, rejfp);
++	      }
++	    else if (j <= pat_end
++		     && (pch_char (j) == '+' || pch_char (j) == '!'))
++	      {
++		fputc('+', rejfp);
++		pch_write_line (j++, rejfp);
++	      }
++	    else if ((i <= pat_end
++		      && (pch_char (i) == ' ' || pch_char (i) == '\n')) &&
++		     (j > pat_end
++		      || (pch_char (j) == ' ' || pch_char (j) == '\n')))
++	      {
++		/* Unless j is already past the end, lines i and j
++		   must be equal here.  */
++
++		if (pch_char (i) == ' ')
++		  fputc(' ', rejfp);
++		pch_write_line (i++, rejfp);
++		if (j <= pat_end)
++		  j++;
++	      }
++	    else if ((j <= pat_end &&
++		     (pch_char (j) == ' ' || pch_char (j) == '\n')) &&
++		     (pch_char (i) == '='))
++	      {
++		if (pch_char (j) == ' ')
++		  fputc(' ', rejfp);
++		pch_write_line (j++, rejfp);
++	      }
++	    else
++	      fatal ("internal error in abort_hunk");
++	  }
++
++	if (ferror (rejfp))
++	  write_fatal ();
++	return;
++      }
+ 
+-    fprintf(rejfp, "***************\n");
++    /* produce context type reject files */
++   
++    fprintf(rejfp, "***************%s\n", function);
+     for (i=0; i<=pat_end; i++) {
+ 	char numbuf0[LINENUM_LENGTH_BOUND + 1];
+ 	char numbuf1[LINENUM_LENGTH_BOUND + 1];
diff --git a/packages/patch/patch_2.5.9.bb b/packages/patch/patch_2.5.9.bb
index 103337b4c9..940b15a205 100644
--- a/packages/patch/patch_2.5.9.bb
+++ b/packages/patch/patch_2.5.9.bb
@@ -3,5 +3,8 @@ require patch.inc
 SRC_URI = "${GNU_MIRROR}/patch/patch-2.5.4.tar.gz \
 	   file://2.5.9.patch;patch=1 \
 	   file://debian.patch;patch=1 \
-	   file://install.patch;patch=1"
+	   file://install.patch;patch=1 \
+           file://unified-reject-files.diff;patch=1 \
+           file://global-reject-file.diff;patch=1 "
 S = "${WORKDIR}/patch-2.5.4"
+PR = "r1"
+\ No newline at end of file
diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb
index 833ca21a53..7da61e91c2 100644
--- a/packages/patcher/patcher-native_20040913.bb
+++ b/packages/patcher/patcher-native_20040913.bb
@@ -14,9 +14,7 @@ SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
 SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 "
 S = "${WORKDIR}/patcher"
 
-PATCHCLEANCMD = ""
-PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
-PATCHCMD_build-freebsd = "num='%s'; name='%s'; file='%s'; gpatch -p "$num" -i "$file""
+PATCHTOOL = "patch"
 
 do_stage() {
 	install -m 0755 patcher.py ${STAGING_BINDIR}/patcher
diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc
index 82c886658c..1d14654f85 100644
--- a/packages/python/python-2.4.3-manifest.inc
+++ b/packages/python/python-2.4.3-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Wed Aug  2 23:25:58 2006
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Fri Aug 25 15:00:35 2006
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -148,8 +148,8 @@ RDEPENDS_python-netserver="python-core python-netclient"
 FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml0"
-RDEPENDS_python-curses="python-core libncurses5"
+PR_python-curses="ml1"
+RDEPENDS_python-curses="python-core"
 FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-syslog="Python's syslog Interface"
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb
index 4fe3ebd402..30c4ee1aee 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.3.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml4"
+PR = "ml5"
 
 PYTHON_MAJMIN = "2.4"
 
@@ -68,4 +68,5 @@ require python-${PV}-manifest.inc
 RPROVIDES_python-core = "python"
 RPROVIDES_python-curses = "python"
 PACKAGES =+ "libpython2"
+PACKAGES_DYNAMIC = "python-* libpython2"
 FILES_libpython2 = "${libdir}/libpython*"
diff --git a/packages/qemu/files/arm_nptl.patch b/packages/qemu/files/arm_nptl.patch
new file mode 100644
index 0000000000..f9b10aebc5
--- /dev/null
+++ b/packages/qemu/files/arm_nptl.patch
@@ -0,0 +1,857 @@
+Index: qemu/configure
+===================================================================
+--- qemu.orig/configure	2006-08-26 16:31:53.000000000 +0100
++++ qemu/configure	2006-08-26 16:31:53.000000000 +0100
+@@ -97,6 +97,7 @@
+ build_docs="no"
+ build_acpi_tables="no"
+ uname_release=""
++nptl="yes"
+ 
+ # OS specific
+ targetos=`uname -s`
+@@ -243,6 +244,8 @@
+   ;;
+   --enable-iasl) build_acpi_tables="yes"
+   ;;
++  --disable-nptl) nptl="no"
++  ;;
+   esac
+ done
+ 
+@@ -441,6 +444,23 @@
+     fi
+ fi
+ 
++# check NPTL support
++cat > $TMPC <<EOF
++#include <sched.h>
++void foo()
++{
++#ifndef CLONE_SETTLS
++#error bork
++#endif
++}
++EOF
++
++if $cc -c -o $TMPO $TMPC 2> /dev/null ; then
++  :
++else
++   nptl="no"
++fi
++
+ ##########################################
+ # SDL probe
+ 
+@@ -559,6 +579,7 @@
+ fi
+ echo "FMOD support      $fmod $fmod_support"
+ echo "kqemu support     $kqemu"
++echo "NPTL support      $nptl"
+ echo "Documentation     $build_docs"
+ [ ! -z "$uname_release" ] && \
+ echo "uname -r          $uname_release"
+@@ -880,6 +901,14 @@
+             echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
+         fi
+     fi
++else
++    if test "$nptl" = "yes" ; then
++        case "$target_cpu" in
++          arm | armeb)
++            echo "#define USE_NPTL 1" >> $config_h
++          ;;
++        esac
++    fi
+ fi
+ 
+ if test "$cocoa" = "yes" ; then
+Index: qemu/exec-all.h
+===================================================================
+--- qemu.orig/exec-all.h	2006-08-26 16:28:32.000000000 +0100
++++ qemu/exec-all.h	2006-08-26 16:31:53.000000000 +0100
+@@ -347,163 +347,7 @@
+ extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
+ extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
+ 
+-#ifdef __powerpc__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-    __asm__ __volatile__ (
+-                          "0:    lwarx %0,0,%1\n"
+-                          "      xor. %0,%3,%0\n"
+-                          "      bne 1f\n"
+-                          "      stwcx. %2,0,%1\n"
+-                          "      bne- 0b\n"
+-                          "1:    "
+-                          : "=&r" (ret)
+-                          : "r" (p), "r" (1), "r" (0)
+-                          : "cr0", "memory");
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __i386__
+-static inline int testandset (int *p)
+-{
+-    long int readval = 0;
+-    
+-    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+-                          : "+m" (*p), "+a" (readval)
+-                          : "r" (1)
+-                          : "cc");
+-    return readval;
+-}
+-#endif
+-
+-#ifdef __x86_64__
+-static inline int testandset (int *p)
+-{
+-    long int readval = 0;
+-    
+-    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+-                          : "+m" (*p), "+a" (readval)
+-                          : "r" (1)
+-                          : "cc");
+-    return readval;
+-}
+-#endif
+-
+-#ifdef __s390__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-
+-    __asm__ __volatile__ ("0: cs    %0,%1,0(%2)\n"
+-			  "   jl    0b"
+-			  : "=&d" (ret)
+-			  : "r" (1), "a" (p), "0" (*p) 
+-			  : "cc", "memory" );
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __alpha__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-    unsigned long one;
+-
+-    __asm__ __volatile__ ("0:	mov 1,%2\n"
+-			  "	ldl_l %0,%1\n"
+-			  "	stl_c %2,%1\n"
+-			  "	beq %2,1f\n"
+-			  ".subsection 2\n"
+-			  "1:	br 0b\n"
+-			  ".previous"
+-			  : "=r" (ret), "=m" (*p), "=r" (one)
+-			  : "m" (*p));
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __sparc__
+-static inline int testandset (int *p)
+-{
+-	int ret;
+-
+-	__asm__ __volatile__("ldstub	[%1], %0"
+-			     : "=r" (ret)
+-			     : "r" (p)
+-			     : "memory");
+-
+-	return (ret ? 1 : 0);
+-}
+-#endif
+-
+-#ifdef __arm__
+-static inline int testandset (int *spinlock)
+-{
+-    register unsigned int ret;
+-    __asm__ __volatile__("swp %0, %1, [%2]"
+-                         : "=r"(ret)
+-                         : "0"(1), "r"(spinlock));
+-    
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __mc68000
+-static inline int testandset (int *p)
+-{
+-    char ret;
+-    __asm__ __volatile__("tas %1; sne %0"
+-                         : "=r" (ret)
+-                         : "m" (p)
+-                         : "cc","memory");
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __ia64
+-#include <ia64intrin.h>
+-
+-static inline int testandset (int *p)
+-{
+-    return __sync_lock_test_and_set (p, 1);
+-}
+-#endif
+-
+-typedef int spinlock_t;
+-
+-#define SPIN_LOCK_UNLOCKED 0
+-
+-#if defined(CONFIG_USER_ONLY)
+-static inline void spin_lock(spinlock_t *lock)
+-{
+-    while (testandset(lock));
+-}
+-
+-static inline void spin_unlock(spinlock_t *lock)
+-{
+-    *lock = 0;
+-}
+-
+-static inline int spin_trylock(spinlock_t *lock)
+-{
+-    return !testandset(lock);
+-}
+-#else
+-static inline void spin_lock(spinlock_t *lock)
+-{
+-}
+-
+-static inline void spin_unlock(spinlock_t *lock)
+-{
+-}
+-
+-static inline int spin_trylock(spinlock_t *lock)
+-{
+-    return 1;
+-}
+-#endif
++#include "qemu_spinlock.h"
+ 
+ extern spinlock_t tb_lock;
+ 
+Index: qemu/linux-user/arm/syscall.h
+===================================================================
+--- qemu.orig/linux-user/arm/syscall.h	2006-03-09 19:18:11.000000000 +0000
++++ qemu/linux-user/arm/syscall.h	2006-08-26 16:31:53.000000000 +0100
+@@ -28,7 +28,9 @@
+ #define ARM_SYSCALL_BASE	0x900000
+ #define ARM_THUMB_SYSCALL	0
+ 
+-#define ARM_NR_cacheflush (ARM_SYSCALL_BASE + 0xf0000 + 2)
++#define ARM_NR_BASE	  0xf0000
++#define ARM_NR_cacheflush (ARM_NR_BASE + 2)
++#define ARM_NR_set_tls	  (ARM_NR_BASE + 5)
+ 
+ #define ARM_NR_semihosting	  0x123456
+ #define ARM_NR_thumb_semihosting  0xAB
+Index: qemu/linux-user/main.c
+===================================================================
+--- qemu.orig/linux-user/main.c	2006-08-26 16:28:40.000000000 +0100
++++ qemu/linux-user/main.c	2006-08-26 16:31:53.000000000 +0100
+@@ -309,6 +309,50 @@
+     }
+ }
+ 
++/* Handle a jump to the kernel code page.  */
++static int
++do_kernel_trap(CPUARMState *env)
++{
++    uint32_t addr;
++    uint32_t *ptr;
++    uint32_t cpsr;
++
++    switch (env->regs[15]) {
++    case 0xffff0fc0: /* __kernel_cmpxchg */
++        /* XXX: This only works between threads, not between processes.
++           Use native atomic operations.  */
++        /* ??? This probably breaks horribly if the access segfaults.  */
++        cpu_lock();
++        ptr = (uint32_t *)env->regs[2];
++        cpsr = cpsr_read(env);
++        if (*ptr == env->regs[0]) {
++            *ptr = env->regs[1];
++            env->regs[0] = 0;
++            cpsr |= CPSR_C;
++        } else {
++            env->regs[0] = -1;
++            cpsr &= ~CPSR_C;
++        }
++        cpsr_write(env, cpsr, CPSR_C);
++        cpu_unlock();
++        break;
++    case 0xffff0fe0: /* __kernel_get_tls */
++        env->regs[0] = env->cp15.c13_tls;
++        break;
++    default:
++        return 1;
++    }
++    /* Jump back to the caller.  */
++    addr = env->regs[14];
++    if (addr & 1) {
++        env->thumb = 1;
++        addr &= ~1;
++    }
++    env->regs[15] = addr;
++
++    return 0;
++}
++
+ void cpu_loop(CPUARMState *env)
+ {
+     int trapnr;
+@@ -365,10 +409,8 @@
+                     }
+                 }
+ 
+-                if (n == ARM_NR_cacheflush) {
+-                    arm_cache_flush(env->regs[0], env->regs[1]);
+-                } else if (n == ARM_NR_semihosting
+-                           || n == ARM_NR_thumb_semihosting) {
++                if (n == ARM_NR_semihosting
++                    || n == ARM_NR_thumb_semihosting) {
+                     env->regs[0] = do_arm_semihosting (env);
+                 } else if (n == 0 || n >= ARM_SYSCALL_BASE
+                            || (env->thumb && n == ARM_THUMB_SYSCALL)) {
+@@ -379,14 +421,34 @@
+                         n -= ARM_SYSCALL_BASE;
+                         env->eabi = 0;
+                     }
+-                    env->regs[0] = do_syscall(env, 
+-                                              n, 
+-                                              env->regs[0],
+-                                              env->regs[1],
+-                                              env->regs[2],
+-                                              env->regs[3],
+-                                              env->regs[4],
+-                                              env->regs[5]);
++                    if ( n > ARM_NR_BASE) {
++                        switch (n)
++                          {
++                          case ARM_NR_cacheflush:
++                              arm_cache_flush(env->regs[0], env->regs[1]);
++                              break;
++#ifdef USE_NPTL
++                          case ARM_NR_set_tls:
++                              cpu_set_tls(env, env->regs[0]);
++                              env->regs[0] = 0;
++                              break;
++#endif
++                          default:
++                              printf ("Error: Bad syscall: %x\n", n);
++                              goto error;
++                          }
++                      }
++                    else
++                      {
++                        env->regs[0] = do_syscall(env, 
++                                                  n, 
++                                                  env->regs[0],
++                                                  env->regs[1],
++                                                  env->regs[2],
++                                                  env->regs[3],
++                                                  env->regs[4],
++                                                  env->regs[5]);
++                      }
+                 } else {
+                     goto error;
+                 }
+@@ -425,6 +487,10 @@
+                   }
+             }
+             break;
++        case EXCP_KERNEL_TRAP:
++            if (do_kernel_trap(env))
++              goto error;
++            break;
+         default:
+         error:
+             fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", 
+@@ -1639,6 +1705,10 @@
+         ts->heap_base = info->brk;
+         /* This will be filled in on the first SYS_HEAPINFO call.  */
+         ts->heap_limit = 0;
++        /* Register the magic kernel code page.  The cpu will generate a
++           special exception when it tries to execute code here.  We can't
++           put real code here because it may be in use by the host kernel.  */
++        page_set_flags(0xffff0000, 0xffff0fff, 0);
+     }
+ #elif defined(TARGET_SPARC)
+     {
+Index: qemu/linux-user/qemu.h
+===================================================================
+--- qemu.orig/linux-user/qemu.h	2006-08-26 16:28:40.000000000 +0100
++++ qemu/linux-user/qemu.h	2006-08-26 16:33:50.000000000 +0100
+@@ -75,6 +75,9 @@
+     uint32_t v86mask;
+ #endif
+     int used; /* non zero if used */
++#ifdef USE_NPTL
++    uint32_t *child_tidptr;
++#endif
+     struct image_info *info;
+     uint8_t stack[0];
+ } __attribute__((aligned(16))) TaskState;
+Index: qemu/linux-user/syscall.c
+===================================================================
+--- qemu.orig/linux-user/syscall.c	2006-08-26 16:28:40.000000000 +0100
++++ qemu/linux-user/syscall.c	2006-08-26 16:31:53.000000000 +0100
+@@ -66,9 +66,18 @@
+ #include <linux/kd.h>
+ 
+ #include "qemu.h"
++#include "qemu_spinlock.h"
+ 
+ //#define DEBUG
+ 
++#ifdef USE_NPTL
++#define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
++    CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
++#else
++/* XXX: Hardcode the above values.  */
++#define CLONE_NPTL_FLAGS2 0
++#endif
++
+ #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC)
+ /* 16 bit uid wrappers emulation */
+ #define USE_UID16
+@@ -1602,20 +1611,38 @@
+    thread/process */
+ #define NEW_STACK_SIZE 8192
+ 
++#ifdef USE_NPTL
++static spinlock_t nptl_lock = SPIN_LOCK_UNLOCKED;
++#endif
++
+ static int clone_func(void *arg)
+ {
+     CPUState *env = arg;
++#ifdef HAVE_NPTL
++    /* Wait until the parent has finshed initializing the tls state.  */
++    while (!spin_trylock(&nptl_lock))
++        usleep(1);
++    spin_unlock(&nptl_lock);
++#endif
+     cpu_loop(env);
+     /* never exits */
+     return 0;
+ }
+ 
+-int do_fork(CPUState *env, unsigned int flags, unsigned long newsp)
++int do_fork(CPUState *env, unsigned int flags, unsigned long newsp,
++            uint32_t *parent_tidptr, void *newtls,
++            uint32_t *child_tidptr)
+ {
+     int ret;
+     TaskState *ts;
+     uint8_t *new_stack;
+     CPUState *new_env;
++#ifdef USE_NPTL
++    unsigned int nptl_flags;
++
++    if (flags & CLONE_PARENT_SETTID)
++        *parent_tidptr = gettid();
++#endif
+     
+     if (flags & CLONE_VM) {
+         ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE);
+@@ -1665,16 +1692,60 @@
+ #error unsupported target CPU
+ #endif
+         new_env->opaque = ts;
++#ifdef USE_NPTL
++     nptl_flags = flags;
++     flags &= ~CLONE_NPTL_FLAGS2;
++     if (nptl_flags & CLONE_CHILD_CLEARTID) {
++          ts->child_tidptr = child_tidptr;
++     }
++     if (nptl_flags & CLONE_SETTLS)
++         cpu_set_tls (new_env, newtls);
++     /* Grab the global cpu lock so that the thread setup appears
++        atomic.  */
++     if (nptl_flags & CLONE_CHILD_SETTID)
++         spin_lock(&nptl_lock);
++#else
++     if (flags & CLONE_NPTL_FLAGS2)
++         return -EINVAL;
++#endif
++
+ #ifdef __ia64__
+         ret = __clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ #else
+ 	ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ #endif
++#ifdef USE_NPTL
++     if (ret != -1) {
++         if (nptl_flags & CLONE_CHILD_SETTID)
++             *child_tidptr = ret;
++     }
++     /* Allow the child to continue.  */
++     if (nptl_flags & CLONE_CHILD_SETTID)
++         spin_unlock(&nptl_lock);
++#endif
+     } else {
+-        /* if no CLONE_VM, we consider it is a fork */
+-        if ((flags & ~CSIGNAL) != 0)
+-            return -EINVAL;
+-        ret = fork();
++    /* if no CLONE_VM, we consider it is a fork */
++    if ((flags & ~(CSIGNAL | CLONE_NPTL_FLAGS2)) != 0)
++          return -EINVAL;
++      ret = fork();
++#ifdef USE_NPTL
++     /* There is a race condition here.  The parent process could
++        theoretically read the TID in the child process before the child
++        tid is set.  This would require using either ptrace
++        (not implemented) or having *_tidptr to point at a shared memory
++        mapping.  We can't repeat the spinlock hack used above because
++        the child process gets its own copy of the lock.  */
++     if (ret == 0) {
++         /* Child Process.  */
++         if (flags & CLONE_CHILD_SETTID)
++             *child_tidptr = gettid();
++         ts = (TaskState *)env->opaque;
++         if (flags & CLONE_CHILD_CLEARTID)
++             ts->child_tidptr = child_tidptr;
++         if (flags & CLONE_SETTLS)
++             cpu_set_tls (env, newtls);
++     }
++#endif
+     }
+     return ret;
+ }
+@@ -1918,7 +1989,7 @@
+         ret = do_brk(arg1);
+         break;
+     case TARGET_NR_fork:
+-        ret = get_errno(do_fork(cpu_env, SIGCHLD, 0));
++        ret = get_errno(do_fork(cpu_env, SIGCHLD, 0, NULL, NULL, NULL));
+         break;
+     case TARGET_NR_waitpid:
+         {
+@@ -2989,7 +3060,8 @@
+         ret = get_errno(fsync(arg1));
+         break;
+     case TARGET_NR_clone:
+-        ret = get_errno(do_fork(cpu_env, arg1, arg2));
++        ret = get_errno(do_fork(cpu_env, arg1, arg2, (uint32_t *)arg3,
++                        (void *)arg4, (uint32_t *)arg5));
+         break;
+ #ifdef __NR_exit_group
+         /* new thread calls */
+@@ -3339,7 +3411,8 @@
+ #endif
+ #ifdef TARGET_NR_vfork
+     case TARGET_NR_vfork:
+-        ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0));
++        ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0,
++                                NULL, NULL, NULL));
+         break;
+ #endif
+ #ifdef TARGET_NR_ugetrlimit
+@@ -3838,4 +3911,3 @@
+ #endif
+     return ret;
+ }
+-
+Index: qemu/target-arm/cpu.h
+===================================================================
+--- qemu.orig/target-arm/cpu.h	2006-03-09 19:18:27.000000000 +0000
++++ qemu/target-arm/cpu.h	2006-08-26 16:31:53.000000000 +0100
+@@ -35,6 +35,9 @@
+ #define EXCP_IRQ             5
+ #define EXCP_FIQ             6
+ #define EXCP_BKPT            7
++#define EXCP_KERNEL_TRAP     8   /* Jumped to kernel code page.  */
++
++
+ 
+ /* We currently assume float and double are IEEE single and double
+    precision respectively.
+@@ -85,6 +88,7 @@
+         uint32_t c9_data;
+         uint32_t c13_fcse; /* FCSE PID.  */
+         uint32_t c13_context; /* Context ID.  */
++        uint32_t c13_tls; /* Paul Brook told me to just add this ;)  */
+     } cp15;
+ 
+     /* Internal CPU feature flags.  */
+@@ -135,6 +139,15 @@
+ int cpu_arm_signal_handler(int host_signum, struct siginfo *info, 
+                            void *puc);
+ 
++void cpu_lock(void);
++void cpu_unlock(void);
++#if defined(USE_NPTL)
++static inline void cpu_set_tls(CPUARMState *env, void *newtls)
++{
++  env->cp15.c13_tls = (uint32_t)newtls;
++}
++#endif
++
+ #define CPSR_M (0x1f)
+ #define CPSR_T (1 << 5)
+ #define CPSR_F (1 << 6)
+@@ -146,7 +159,11 @@
+ #define CPSR_J (1 << 24)
+ #define CPSR_IT_0_1 (3 << 25)
+ #define CPSR_Q (1 << 27)
+-#define CPSR_NZCV (0xf << 28)
++#define CPSR_V (1 << 28)
++#define CPSR_C (1 << 29)
++#define CPSR_Z (1 << 30)
++#define CPSR_N (1 << 31)
++#define CPSR_NZCV (CPSR_N | CPSR_Z | CPSR_C | CPSR_V)
+ 
+ #define CACHED_CPSR_BITS (CPSR_T | CPSR_Q | CPSR_NZCV)
+ /* Return the current CPSR value.  */
+Index: qemu/target-arm/exec.h
+===================================================================
+--- qemu.orig/target-arm/exec.h	2006-03-09 19:18:27.000000000 +0000
++++ qemu/target-arm/exec.h	2006-08-26 16:31:53.000000000 +0100
+@@ -51,8 +51,6 @@
+ 
+ /* In op_helper.c */
+ 
+-void cpu_lock(void);
+-void cpu_unlock(void);
+ void helper_set_cp15(CPUState *, uint32_t, uint32_t);
+ uint32_t helper_get_cp15(CPUState *, uint32_t);
+ 
+Index: qemu/target-arm/op.c
+===================================================================
+--- qemu.orig/target-arm/op.c	2006-08-26 16:28:48.000000000 +0100
++++ qemu/target-arm/op.c	2006-08-26 16:31:53.000000000 +0100
+@@ -891,6 +891,12 @@
+     cpu_loop_exit();
+ }
+ 
++void OPPROTO op_kernel_trap(void)
++{
++    env->exception_index = EXCP_KERNEL_TRAP;
++    cpu_loop_exit();
++}
++
+ /* VFP support.  We follow the convention used for VFP instrunctions:
+    Single precition routines have a "s" suffix, double precision a
+    "d" suffix.  */
+Index: qemu/target-arm/translate.c
+===================================================================
+--- qemu.orig/target-arm/translate.c	2006-08-26 16:28:48.000000000 +0100
++++ qemu/target-arm/translate.c	2006-08-26 16:31:53.000000000 +0100
+@@ -2382,6 +2382,7 @@
+     s->is_jmp = DISAS_JUMP;
+ }
+ 
++
+ /* generate intermediate code in gen_opc_buf and gen_opparam_buf for
+    basic block 'tb'. If search_pc is TRUE, also generate PC
+    information for each intermediate instruction. */
+@@ -2416,6 +2417,15 @@
+     nb_gen_labels = 0;
+     lj = -1;
+     do {
++#ifdef CONFIG_USER_ONLY
++        /* Intercept jump to the magic kernel page.  */
++        if (dc->pc > 0xffff0000) {
++            gen_op_kernel_trap();
++            dc->is_jmp = DISAS_UPDATE;
++            break;
++        }
++#endif
++
+         if (env->nb_breakpoints > 0) {
+             for(j = 0; j < env->nb_breakpoints; j++) {
+                 if (env->breakpoints[j] == dc->pc) {
+Index: qemu/qemu_spinlock.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ qemu/qemu_spinlock.h	2006-08-26 16:31:53.000000000 +0100
+@@ -0,0 +1,182 @@
++/*
++ * internal execution defines for qemu
++ *
++ *  Copyright (c) 2003 Fabrice Bellard
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#ifndef _QEMU_SPINLOCK_H
++#define _QEMU_SPINLOCK_H
++
++#ifdef __powerpc__
++static inline int testandset (int *p)
++{
++    int ret;
++    __asm__ __volatile__ (
++                          "0:    lwarx %0,0,%1\n"
++                          "      xor. %0,%3,%0\n"
++                          "      bne 1f\n"
++                          "      stwcx. %2,0,%1\n"
++                          "      bne- 0b\n"
++                          "1:    "
++                          : "=&r" (ret)
++                          : "r" (p), "r" (1), "r" (0)
++                          : "cr0", "memory");
++    return ret;
++}
++#endif
++
++#ifdef __i386__
++static inline int testandset (int *p)
++{
++    long int readval = 0;
++
++    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
++                          : "+m" (*p), "+a" (readval)
++                          : "r" (1)
++                          : "cc");
++    return readval;
++}
++#endif
++
++#ifdef __x86_64__
++static inline int testandset (int *p)
++{
++    long int readval = 0;
++
++    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
++                          : "+m" (*p), "+a" (readval)
++                          : "r" (1)
++                          : "cc");
++    return readval;
++}
++#endif
++
++#ifdef __s390__
++static inline int testandset (int *p)
++{
++    int ret;
++
++    __asm__ __volatile__ ("0: cs    %0,%1,0(%2)\n"
++                         "   jl    0b"
++                         : "=&d" (ret)
++                         : "r" (1), "a" (p), "0" (*p)
++                         : "cc", "memory" );
++    return ret;
++}
++#endif
++
++#ifdef __alpha__
++static inline int testandset (int *p)
++{
++    int ret;
++    unsigned long one;
++
++    __asm__ __volatile__ ("0:  mov 1,%2\n"
++                         "     ldl_l %0,%1\n"
++                         "     stl_c %2,%1\n"
++                         "     beq %2,1f\n"
++                         ".subsection 2\n"
++                         "1:   br 0b\n"
++                         ".previous"
++                         : "=r" (ret), "=m" (*p), "=r" (one)
++                         : "m" (*p));
++    return ret;
++}
++#endif
++
++#ifdef __sparc__
++static inline int testandset (int *p)
++{
++       int ret;
++
++       __asm__ __volatile__("ldstub    [%1], %0"
++                            : "=r" (ret)
++                            : "r" (p)
++                            : "memory");
++
++       return (ret ? 1 : 0);
++}
++#endif
++
++#ifdef __arm__
++static inline int testandset (int *spinlock)
++{
++    register unsigned int ret;
++    __asm__ __volatile__("swp %0, %1, [%2]"
++                         : "=r"(ret)
++                         : "0"(1), "r"(spinlock));
++
++    return ret;
++}
++#endif
++
++#ifdef __mc68000
++static inline int testandset (int *p)
++{
++    char ret;
++    __asm__ __volatile__("tas %1; sne %0"
++                         : "=r" (ret)
++                         : "m" (p)
++                         : "cc","memory");
++    return ret;
++}
++#endif
++
++#ifdef __ia64
++#include <ia64intrin.h>
++
++static inline int testandset (int *p)
++{
++    return __sync_lock_test_and_set (p, 1);
++}
++#endif
++
++typedef int spinlock_t;
++
++#define SPIN_LOCK_UNLOCKED 0
++
++#if defined(CONFIG_USER_ONLY)
++static inline void spin_lock(spinlock_t *lock)
++{
++    while (testandset(lock));
++}
++
++static inline void spin_unlock(spinlock_t *lock)
++{
++    *lock = 0;
++}
++
++static inline int spin_trylock(spinlock_t *lock)
++{
++    return !testandset(lock);
++}
++#else
++static inline void spin_lock(spinlock_t *lock)
++{
++}
++
++static inline void spin_unlock(spinlock_t *lock)
++{
++}
++
++static inline int spin_trylock(spinlock_t *lock)
++{
++    return 1;
++}
++#endif
++
++#endif /* ! _QEMU_SPINLOCK_H */
diff --git a/packages/qemu/qemu-0.8.0/.mtn2git_empty b/packages/qemu/qemu-0.8.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qemu/qemu-0.8.0/.mtn2git_empty
diff --git a/packages/qemu/qemu-0.8.0/arm_nptl.patch b/packages/qemu/qemu-0.8.0/arm_nptl.patch
new file mode 100644
index 0000000000..daf105071c
--- /dev/null
+++ b/packages/qemu/qemu-0.8.0/arm_nptl.patch
@@ -0,0 +1,854 @@
+diff -ur qemu-0.8.0.orig/configure qemu-0.8.0/configure
+--- qemu-0.8.0.orig/configure	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/configure	2006-07-12 15:26:40.000000000 +0300
+@@ -89,6 +89,7 @@
+ cocoa="no"
+ check_gfx="yes"
+ check_gcc="yes"
++nptl=yes
+ 
+ # OS specific
+ targetos=`uname -s`
+@@ -205,6 +206,8 @@
+   ;;
+   --disable-gcc-check) check_gcc="no"
+   ;;
++  --disable-nptl) nptl="no"
++  ;;
+   esac
+ done
+ 
+@@ -299,6 +302,23 @@
+     fi
+ fi
+ 
++# check NPTL support
++cat > $TMPC <<EOF
++#include <sched.h>
++void foo()
++{
++#ifndef CLONE_SETTLS
++#error bork
++#endif
++}
++EOF
++
++if $cc -c -o $TMPO $TMPC 2> /dev/null ; then
++  :
++else
++   nptl="no"
++fi
++
+ ##########################################
+ # SDL probe
+ 
+@@ -489,6 +509,7 @@
+ fi
+ echo ""
+ echo "kqemu support     $kqemu"
++echo "NPTL support      $nptl"
+ if test $kqemu = "yes" -a $linux = "yes" ; then
+ echo ""
+ echo "KQEMU Linux module configuration:"
+@@ -793,6 +814,14 @@
+         fi
+         echo "" >> $config_mak
+     fi
++else
++    if test "$nptl" = "yes" ; then
++        case "$target_cpu" in
++          arm | armeb)
++            echo "#define USE_NPTL 1" >> $config_h
++          ;;
++        esac
++    fi
+ fi
+ 
+ if test "$cocoa" = "yes" ; then
+Only in qemu-0.8.0: configure.rej~
+Only in qemu-0.8.0: configure~
+diff -ur qemu-0.8.0.orig/exec-all.h qemu-0.8.0/exec-all.h
+--- qemu-0.8.0.orig/exec-all.h	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/exec-all.h	2006-07-12 15:23:46.000000000 +0300
+@@ -347,163 +347,7 @@
+ extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
+ extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
+ 
+-#ifdef __powerpc__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-    __asm__ __volatile__ (
+-                          "0:    lwarx %0,0,%1\n"
+-                          "      xor. %0,%3,%0\n"
+-                          "      bne 1f\n"
+-                          "      stwcx. %2,0,%1\n"
+-                          "      bne- 0b\n"
+-                          "1:    "
+-                          : "=&r" (ret)
+-                          : "r" (p), "r" (1), "r" (0)
+-                          : "cr0", "memory");
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __i386__
+-static inline int testandset (int *p)
+-{
+-    long int readval = 0;
+-    
+-    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+-                          : "+m" (*p), "+a" (readval)
+-                          : "r" (1)
+-                          : "cc");
+-    return readval;
+-}
+-#endif
+-
+-#ifdef __x86_64__
+-static inline int testandset (int *p)
+-{
+-    long int readval = 0;
+-    
+-    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+-                          : "+m" (*p), "+a" (readval)
+-                          : "r" (1)
+-                          : "cc");
+-    return readval;
+-}
+-#endif
+-
+-#ifdef __s390__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-
+-    __asm__ __volatile__ ("0: cs    %0,%1,0(%2)\n"
+-			  "   jl    0b"
+-			  : "=&d" (ret)
+-			  : "r" (1), "a" (p), "0" (*p) 
+-			  : "cc", "memory" );
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __alpha__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-    unsigned long one;
+-
+-    __asm__ __volatile__ ("0:	mov 1,%2\n"
+-			  "	ldl_l %0,%1\n"
+-			  "	stl_c %2,%1\n"
+-			  "	beq %2,1f\n"
+-			  ".subsection 2\n"
+-			  "1:	br 0b\n"
+-			  ".previous"
+-			  : "=r" (ret), "=m" (*p), "=r" (one)
+-			  : "m" (*p));
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __sparc__
+-static inline int testandset (int *p)
+-{
+-	int ret;
+-
+-	__asm__ __volatile__("ldstub	[%1], %0"
+-			     : "=r" (ret)
+-			     : "r" (p)
+-			     : "memory");
+-
+-	return (ret ? 1 : 0);
+-}
+-#endif
+-
+-#ifdef __arm__
+-static inline int testandset (int *spinlock)
+-{
+-    register unsigned int ret;
+-    __asm__ __volatile__("swp %0, %1, [%2]"
+-                         : "=r"(ret)
+-                         : "0"(1), "r"(spinlock));
+-    
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __mc68000
+-static inline int testandset (int *p)
+-{
+-    char ret;
+-    __asm__ __volatile__("tas %1; sne %0"
+-                         : "=r" (ret)
+-                         : "m" (p)
+-                         : "cc","memory");
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __ia64
+-#include <ia64intrin.h>
+-
+-static inline int testandset (int *p)
+-{
+-    return __sync_lock_test_and_set (p, 1);
+-}
+-#endif
+-
+-typedef int spinlock_t;
+-
+-#define SPIN_LOCK_UNLOCKED 0
+-
+-#if defined(CONFIG_USER_ONLY)
+-static inline void spin_lock(spinlock_t *lock)
+-{
+-    while (testandset(lock));
+-}
+-
+-static inline void spin_unlock(spinlock_t *lock)
+-{
+-    *lock = 0;
+-}
+-
+-static inline int spin_trylock(spinlock_t *lock)
+-{
+-    return !testandset(lock);
+-}
+-#else
+-static inline void spin_lock(spinlock_t *lock)
+-{
+-}
+-
+-static inline void spin_unlock(spinlock_t *lock)
+-{
+-}
+-
+-static inline int spin_trylock(spinlock_t *lock)
+-{
+-    return 1;
+-}
+-#endif
++#include "qemu_spinlock.h"
+ 
+ extern spinlock_t tb_lock;
+ 
+diff -ur qemu-0.8.0.orig/linux-user/arm/syscall.h qemu-0.8.0/linux-user/arm/syscall.h
+--- qemu-0.8.0.orig/linux-user/arm/syscall.h	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/linux-user/arm/syscall.h	2006-07-12 15:23:46.000000000 +0300
+@@ -28,7 +28,9 @@
+ #define ARM_SYSCALL_BASE	0x900000
+ #define ARM_THUMB_SYSCALL	0
+ 
+-#define ARM_NR_cacheflush (ARM_SYSCALL_BASE + 0xf0000 + 2)
++#define ARM_NR_BASE	  0xf0000
++#define ARM_NR_cacheflush (ARM_NR_BASE + 2)
++#define ARM_NR_set_tls	  (ARM_NR_BASE + 5)
+ 
+ #define ARM_NR_semihosting	  0x123456
+ #define ARM_NR_thumb_semihosting  0xAB
+diff -ur qemu-0.8.0.orig/linux-user/main.c qemu-0.8.0/linux-user/main.c
+--- qemu-0.8.0.orig/linux-user/main.c	2006-07-12 15:20:37.000000000 +0300
++++ qemu-0.8.0/linux-user/main.c	2006-07-12 15:23:46.000000000 +0300
+@@ -326,6 +326,50 @@
+     }
+ }
+ 
++/* Handle a jump to the kernel code page.  */
++static int
++do_kernel_trap(CPUARMState *env)
++{
++    uint32_t addr;
++    uint32_t *ptr;
++    uint32_t cpsr;
++
++    switch (env->regs[15]) {
++    case 0xffff0fc0: /* __kernel_cmpxchg */
++        /* XXX: This only works between threads, not between processes.
++           Use native atomic operations.  */
++        /* ??? This probably breaks horribly if the access segfaults.  */
++        cpu_lock();
++        ptr = (uint32_t *)env->regs[2];
++        cpsr = cpsr_read(env);
++        if (*ptr == env->regs[0]) {
++            *ptr = env->regs[1];
++            env->regs[0] = 0;
++            cpsr |= CPSR_C;
++        } else {
++            env->regs[0] = -1;
++            cpsr &= ~CPSR_C;
++        }
++        cpsr_write(env, cpsr, CPSR_C);
++        cpu_unlock();
++        break;
++    case 0xffff0fe0: /* __kernel_get_tls */
++        env->regs[0] = env->cp15.c13_tls;
++        break;
++    default:
++        return 1;
++    }
++    /* Jump back to the caller.  */
++    addr = env->regs[14];
++    if (addr & 1) {
++        env->thumb = 1;
++        addr &= ~1;
++    }
++    env->regs[15] = addr;
++
++    return 0;
++}
++
+ void cpu_loop(CPUARMState *env)
+ {
+     int trapnr;
+@@ -368,10 +412,8 @@
+                     n = insn & 0xffffff;
+                 }
+ 
+-                if (n == ARM_NR_cacheflush) {
+-                    arm_cache_flush(env->regs[0], env->regs[1]);
+-                } else if (n == ARM_NR_semihosting
+-                           || n == ARM_NR_thumb_semihosting) {
++                if (n == ARM_NR_semihosting
++                    || n == ARM_NR_thumb_semihosting) {
+                     env->regs[0] = do_arm_semihosting (env);
+                 } else if (n >= ARM_SYSCALL_BASE
+                            || (env->thumb && n == ARM_THUMB_SYSCALL)) {
+@@ -381,14 +423,34 @@
+                     } else {
+                         n -= ARM_SYSCALL_BASE;
+                     }
+-                    env->regs[0] = do_syscall(env, 
+-                                              n, 
+-                                              env->regs[0],
+-                                              env->regs[1],
+-                                              env->regs[2],
+-                                              env->regs[3],
+-                                              env->regs[4],
+-                                              env->regs[5]);
++                    if ( n > ARM_NR_BASE) {
++                        switch (n)
++                          {
++                          case ARM_NR_cacheflush:
++                              arm_cache_flush(env->regs[0], env->regs[1]);
++                              break;
++#ifdef USE_NPTL
++                          case ARM_NR_set_tls:
++                              cpu_set_tls(env, env->regs[0]);
++                              env->regs[0] = 0;
++                              break;
++#endif
++                          default:
++                              printf ("Error: Bad syscall: %x\n", n);
++                              goto error;
++                          }
++                      }
++                    else
++                      {
++                        env->regs[0] = do_syscall(env, 
++                                                  n, 
++                                                  env->regs[0],
++                                                  env->regs[1],
++                                                  env->regs[2],
++                                                  env->regs[3],
++                                                  env->regs[4],
++                                                  env->regs[5]);
++                      }
+                 } else {
+                     goto error;
+                 }
+@@ -427,6 +489,10 @@
+                   }
+             }
+             break;
++        case EXCP_KERNEL_TRAP:
++            if (do_kernel_trap(env))
++              goto error;
++            break;
+         default:
+         error:
+             fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", 
+@@ -1602,6 +1668,10 @@
+         ts->heap_base = info->brk;
+         /* This will be filled in on the first SYS_HEAPINFO call.  */
+         ts->heap_limit = 0;
++        /* Register the magic kernel code page.  The cpu will generate a
++           special exception when it tries to execute code here.  We can't
++           put real code here because it may be in use by the host kernel.  */
++        page_set_flags(0xffff0000, 0xffff0fff, 0);
+     }
+ #elif defined(TARGET_SPARC)
+     {
+diff -ur qemu-0.8.0.orig/linux-user/qemu.h qemu-0.8.0/linux-user/qemu.h
+--- qemu-0.8.0.orig/linux-user/qemu.h	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/linux-user/qemu.h	2006-07-12 15:23:46.000000000 +0300
+@@ -76,6 +76,9 @@
+     uint32_t v86mask;
+ #endif
+     int used; /* non zero if used */
++#ifdef USE_NPTL
++    uint32_t *child_tidptr;
++#endif
+     uint8_t stack[0];
+ } __attribute__((aligned(16))) TaskState;
+ 
+Only in qemu-0.8.0.orig/linux-user: signal.c.orig
+diff -ur qemu-0.8.0.orig/linux-user/syscall.c qemu-0.8.0/linux-user/syscall.c
+--- qemu-0.8.0.orig/linux-user/syscall.c	2006-07-12 15:20:37.000000000 +0300
++++ qemu-0.8.0/linux-user/syscall.c	2006-07-12 15:36:51.000000000 +0300
+@@ -72,9 +72,18 @@
+ #include <linux/kd.h>
+ 
+ #include "qemu.h"
++#include "qemu_spinlock.h"
+ 
+ //#define DEBUG
+ 
++#ifdef USE_NPTL
++#define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
++    CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
++#else
++/* XXX: Hardcode the above values.  */
++#define CLONE_NPTL_FLAGS2 0
++#endif
++
+ #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC)
+ /* 16 bit uid wrappers emulation */
+ #define USE_UID16
+@@ -1527,20 +1536,38 @@
+    thread/process */
+ #define NEW_STACK_SIZE 8192
+ 
++#ifdef USE_NPTL
++static spinlock_t nptl_lock = SPIN_LOCK_UNLOCKED;
++#endif
++
+ static int clone_func(void *arg)
+ {
+     CPUState *env = arg;
++#ifdef HAVE_NPTL
++    /* Wait until the parent has finshed initializing the tls state.  */
++    while (!spin_trylock(&nptl_lock))
++        usleep(1);
++    spin_unlock(&nptl_lock);
++#endif
+     cpu_loop(env);
+     /* never exits */
+     return 0;
+ }
+ 
+-int do_fork(CPUState *env, unsigned int flags, unsigned long newsp)
++int do_fork(CPUState *env, unsigned int flags, unsigned long newsp,
++            uint32_t *parent_tidptr, void *newtls,
++            uint32_t *child_tidptr)
+ {
+     int ret;
+     TaskState *ts;
+     uint8_t *new_stack;
+     CPUState *new_env;
++#ifdef USE_NPTL
++    unsigned int nptl_flags;
++
++    if (flags & CLONE_PARENT_SETTID)
++        *parent_tidptr = gettid();
++#endif
+     
+     if (flags & CLONE_VM) {
+         ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE);
+@@ -1576,16 +1603,62 @@
+ #error unsupported target CPU
+ #endif
+         new_env->opaque = ts;
++#ifdef USE_NPTL
++        nptl_flags = flags;
++        flags &= ~CLONE_NPTL_FLAGS2;
++
++        if (nptl_flags & CLONE_CHILD_CLEARTID) {
++             ts->child_tidptr = child_tidptr;
++        }
++
++        if (nptl_flags & CLONE_SETTLS)
++            cpu_set_tls (new_env, newtls);
++        /* Grab the global cpu lock so that the thread setup appears
++           atomic.  */
++        if (nptl_flags & CLONE_CHILD_SETTID)
++            spin_lock(&nptl_lock);
++#else
++        if (flags & CLONE_NPTL_FLAGS2)
++            return -EINVAL;
++#endif
++
+ #ifdef __ia64__
+         ret = clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ #else
+ 	ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ #endif
++#ifdef USE_NPTL
++        if (ret != -1) {
++            if (nptl_flags & CLONE_CHILD_SETTID)
++                *child_tidptr = ret;
++        }
++        /* Allow the child to continue.  */
++        if (nptl_flags & CLONE_CHILD_SETTID)
++            spin_unlock(&nptl_lock);
++#endif
+     } else {
+         /* if no CLONE_VM, we consider it is a fork */
+-        if ((flags & ~CSIGNAL) != 0)
++	if ((flags & ~(CSIGNAL | CLONE_NPTL_FLAGS2)) != 0)
+             return -EINVAL;
+         ret = fork();
++#ifdef USE_NPTL
++        /* There is a race condition here.  The parent process could
++           theoretically read the TID in the child process before the child
++           tid is set.  This would require using either ptrace
++           (not implemented) or having *_tidptr to point at a shared memory
++           mapping.  We can't repeat the spinlock hack used above because
++           the child process gets its own copy of the lock.  */
++        if (ret == 0) {
++            /* Child Process.  */
++            if (flags & CLONE_CHILD_SETTID)
++                *child_tidptr = gettid();
++            ts = (TaskState *)env->opaque;
++            if (flags & CLONE_CHILD_CLEARTID)
++                ts->child_tidptr = child_tidptr;
++            if (flags & CLONE_SETTLS)
++                cpu_set_tls (env, newtls);
++        }
++#endif
+     }
+     return ret;
+ }
+@@ -1757,7 +1830,7 @@
+         ret = do_brk((char *)arg1);
+         break;
+     case TARGET_NR_fork:
+-        ret = get_errno(do_fork(cpu_env, SIGCHLD, 0));
++        ret = get_errno(do_fork(cpu_env, SIGCHLD, 0, NULL, NULL, NULL));
+         break;
+     case TARGET_NR_waitpid:
+         {
+@@ -2564,7 +2637,8 @@
+         ret = get_errno(fsync(arg1));
+         break;
+     case TARGET_NR_clone:
+-        ret = get_errno(do_fork(cpu_env, arg1, arg2));
++        ret = get_errno(do_fork(cpu_env, arg1, arg2, (uint32_t *)arg3,
++                        (void *)arg4, (uint32_t *)arg5));
+         break;
+ #ifdef __NR_exit_group
+         /* new thread calls */
+@@ -2925,7 +2999,8 @@
+ #endif
+ #ifdef TARGET_NR_vfork
+     case TARGET_NR_vfork:
+-        ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0));
++        ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0,
++                                NULL, NULL, NULL));
+         break;
+ #endif
+ #ifdef TARGET_NR_ugetrlimit
+@@ -3347,4 +3422,3 @@
+ #endif
+     return ret;
+ }
+-
+Only in qemu-0.8.0.orig/linux-user: syscall.c.orig
+Only in qemu-0.8.0/linux-user: syscall.c.rej~
+Only in qemu-0.8.0/linux-user: syscall.c~
+Only in qemu-0.8.0: qemu_spinlock.h
+diff -ur qemu-0.8.0.orig/target-arm/cpu.h qemu-0.8.0/target-arm/cpu.h
+--- qemu-0.8.0.orig/target-arm/cpu.h	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/target-arm/cpu.h	2006-07-12 15:27:28.000000000 +0300
+@@ -34,6 +34,9 @@
+ #define EXCP_DATA_ABORT      4
+ #define EXCP_IRQ             5
+ #define EXCP_FIQ             6
++#define EXCP_BKPT            7
++#define EXCP_KERNEL_TRAP     8   /* Jumped to kernel code page.  */
++
+ 
+ /* We currently assume float and double are IEEE single and double
+    precision respectively.
+@@ -83,6 +86,7 @@
+         uint32_t c9_data;
+         uint32_t c13_fcse; /* FCSE PID.  */
+         uint32_t c13_context; /* Context ID.  */
++        uint32_t c13_tls; /* Paul Brook told me to just add this ;)  */
+     } cp15;
+     
+     /* exception/interrupt handling */
+@@ -126,6 +130,15 @@
+ int cpu_arm_signal_handler(int host_signum, struct siginfo *info, 
+                            void *puc);
+ 
++void cpu_lock(void);
++void cpu_unlock(void);
++#if defined(USE_NPTL)
++static inline void cpu_set_tls(CPUARMState *env, void *newtls)
++{
++  env->cp15.c13_tls = (uint32_t)newtls;
++}
++#endif
++
+ #define CPSR_M (0x1f)
+ #define CPSR_T (1 << 5)
+ #define CPSR_F (1 << 6)
+@@ -137,7 +150,11 @@
+ #define CPSR_J (1 << 24)
+ #define CPSR_IT_0_1 (3 << 25)
+ #define CPSR_Q (1 << 27)
+-#define CPSR_NZCV (0xf << 28)
++#define CPSR_V (1 << 28)
++#define CPSR_C (1 << 29)
++#define CPSR_Z (1 << 30)
++#define CPSR_N (1 << 31)
++#define CPSR_NZCV (CPSR_N | CPSR_Z | CPSR_C | CPSR_V)
+ 
+ #define CACHED_CPSR_BITS (CPSR_T | CPSR_Q | CPSR_NZCV)
+ /* Return the current CPSR value.  */
+Only in qemu-0.8.0/target-arm: cpu.h~
+diff -ur qemu-0.8.0.orig/target-arm/exec.h qemu-0.8.0/target-arm/exec.h
+--- qemu-0.8.0.orig/target-arm/exec.h	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/target-arm/exec.h	2006-07-12 15:23:46.000000000 +0300
+@@ -51,8 +51,6 @@
+ 
+ /* In op_helper.c */
+ 
+-void cpu_lock(void);
+-void cpu_unlock(void);
+ void helper_set_cp15(CPUState *, uint32_t, uint32_t);
+ uint32_t helper_get_cp15(CPUState *, uint32_t);
+ 
+diff -ur qemu-0.8.0.orig/target-arm/op.c qemu-0.8.0/target-arm/op.c
+--- qemu-0.8.0.orig/target-arm/op.c	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/target-arm/op.c	2006-07-12 15:23:46.000000000 +0300
+@@ -885,6 +885,12 @@
+     cpu_loop_exit();
+ }
+ 
++void OPPROTO op_kernel_trap(void)
++{
++    env->exception_index = EXCP_KERNEL_TRAP;
++    cpu_loop_exit();
++}
++
+ /* VFP support.  We follow the convention used for VFP instrunctions:
+    Single precition routines have a "s" suffix, double precision a
+    "d" suffix.  */
+diff -ur qemu-0.8.0.orig/target-arm/translate.c qemu-0.8.0/target-arm/translate.c
+--- qemu-0.8.0.orig/target-arm/translate.c	2005-12-20 00:51:53.000000000 +0200
++++ qemu-0.8.0/target-arm/translate.c	2006-07-12 15:23:46.000000000 +0300
+@@ -2282,6 +2282,7 @@
+     s->is_jmp = DISAS_JUMP;
+ }
+ 
++
+ /* generate intermediate code in gen_opc_buf and gen_opparam_buf for
+    basic block 'tb'. If search_pc is TRUE, also generate PC
+    information for each intermediate instruction. */
+@@ -2316,6 +2317,15 @@
+     nb_gen_labels = 0;
+     lj = -1;
+     do {
++#ifdef CONFIG_USER_ONLY
++        /* Intercept jump to the magic kernel page.  */
++        if (dc->pc > 0xffff0000) {
++            gen_op_kernel_trap();
++            dc->is_jmp = DISAS_UPDATE;
++            break;
++        }
++#endif
++
+         if (env->nb_breakpoints > 0) {
+             for(j = 0; j < env->nb_breakpoints; j++) {
+                 if (env->breakpoints[j] == dc->pc) {
+diff -urN qemu-0.8.1.orig/qemu_spinlock.h qemu-0.8.1/qemu_spinlock.h
+--- qemu-0.8.1.orig/qemu_spinlock.h     1970-01-01 02:00:00.000000000 +0200
++++ qemu-0.8.1/qemu_spinlock.h  2006-06-04 00:59:23.000000000 +0300
+@@ -0,0 +1,182 @@
++/*
++ * internal execution defines for qemu
++ *
++ *  Copyright (c) 2003 Fabrice Bellard
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#ifndef _QEMU_SPINLOCK_H
++#define _QEMU_SPINLOCK_H
++
++#ifdef __powerpc__
++static inline int testandset (int *p)
++{
++    int ret;
++    __asm__ __volatile__ (
++                          "0:    lwarx %0,0,%1\n"
++                          "      xor. %0,%3,%0\n"
++                          "      bne 1f\n"
++                          "      stwcx. %2,0,%1\n"
++                          "      bne- 0b\n"
++                          "1:    "
++                          : "=&r" (ret)
++                          : "r" (p), "r" (1), "r" (0)
++                          : "cr0", "memory");
++    return ret;
++}
++#endif
++
++#ifdef __i386__
++static inline int testandset (int *p)
++{
++    long int readval = 0;
++
++    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
++                          : "+m" (*p), "+a" (readval)
++                          : "r" (1)
++                          : "cc");
++    return readval;
++}
++#endif
++
++#ifdef __x86_64__
++static inline int testandset (int *p)
++{
++    long int readval = 0;
++
++    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
++                          : "+m" (*p), "+a" (readval)
++                          : "r" (1)
++                          : "cc");
++    return readval;
++}
++#endif
++
++#ifdef __s390__
++static inline int testandset (int *p)
++{
++    int ret;
++
++    __asm__ __volatile__ ("0: cs    %0,%1,0(%2)\n"
++                         "   jl    0b"
++                         : "=&d" (ret)
++                         : "r" (1), "a" (p), "0" (*p)
++                         : "cc", "memory" );
++    return ret;
++}
++#endif
++
++#ifdef __alpha__
++static inline int testandset (int *p)
++{
++    int ret;
++    unsigned long one;
++
++    __asm__ __volatile__ ("0:  mov 1,%2\n"
++                         "     ldl_l %0,%1\n"
++                         "     stl_c %2,%1\n"
++                         "     beq %2,1f\n"
++                         ".subsection 2\n"
++                         "1:   br 0b\n"
++                         ".previous"
++                         : "=r" (ret), "=m" (*p), "=r" (one)
++                         : "m" (*p));
++    return ret;
++}
++#endif
++
++#ifdef __sparc__
++static inline int testandset (int *p)
++{
++       int ret;
++
++       __asm__ __volatile__("ldstub    [%1], %0"
++                            : "=r" (ret)
++                            : "r" (p)
++                            : "memory");
++
++       return (ret ? 1 : 0);
++}
++#endif
++
++#ifdef __arm__
++static inline int testandset (int *spinlock)
++{
++    register unsigned int ret;
++    __asm__ __volatile__("swp %0, %1, [%2]"
++                         : "=r"(ret)
++                         : "0"(1), "r"(spinlock));
++
++    return ret;
++}
++#endif
++
++#ifdef __mc68000
++static inline int testandset (int *p)
++{
++    char ret;
++    __asm__ __volatile__("tas %1; sne %0"
++                         : "=r" (ret)
++                         : "m" (p)
++                         : "cc","memory");
++    return ret;
++}
++#endif
++
++#ifdef __ia64
++#include <ia64intrin.h>
++
++static inline int testandset (int *p)
++{
++    return __sync_lock_test_and_set (p, 1);
++}
++#endif
++
++typedef int spinlock_t;
++
++#define SPIN_LOCK_UNLOCKED 0
++
++#if defined(CONFIG_USER_ONLY)
++static inline void spin_lock(spinlock_t *lock)
++{
++    while (testandset(lock));
++}
++
++static inline void spin_unlock(spinlock_t *lock)
++{
++    *lock = 0;
++}
++
++static inline int spin_trylock(spinlock_t *lock)
++{
++    return !testandset(lock);
++}
++#else
++static inline void spin_lock(spinlock_t *lock)
++{
++}
++
++static inline void spin_unlock(spinlock_t *lock)
++{
++}
++
++static inline int spin_trylock(spinlock_t *lock)
++{
++    return 1;
++}
++#endif
++
++#endif /* ! _QEMU_SPINLOCK_H */
+
diff --git a/packages/qemu/qemu-0.8.2/.mtn2git_empty b/packages/qemu/qemu-0.8.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qemu/qemu-0.8.2/.mtn2git_empty
diff --git a/packages/qemu/qemu-0.8.2/arm_nptl.patch b/packages/qemu/qemu-0.8.2/arm_nptl.patch
new file mode 100644
index 0000000000..f9b10aebc5
--- /dev/null
+++ b/packages/qemu/qemu-0.8.2/arm_nptl.patch
@@ -0,0 +1,857 @@
+Index: qemu/configure
+===================================================================
+--- qemu.orig/configure	2006-08-26 16:31:53.000000000 +0100
++++ qemu/configure	2006-08-26 16:31:53.000000000 +0100
+@@ -97,6 +97,7 @@
+ build_docs="no"
+ build_acpi_tables="no"
+ uname_release=""
++nptl="yes"
+ 
+ # OS specific
+ targetos=`uname -s`
+@@ -243,6 +244,8 @@
+   ;;
+   --enable-iasl) build_acpi_tables="yes"
+   ;;
++  --disable-nptl) nptl="no"
++  ;;
+   esac
+ done
+ 
+@@ -441,6 +444,23 @@
+     fi
+ fi
+ 
++# check NPTL support
++cat > $TMPC <<EOF
++#include <sched.h>
++void foo()
++{
++#ifndef CLONE_SETTLS
++#error bork
++#endif
++}
++EOF
++
++if $cc -c -o $TMPO $TMPC 2> /dev/null ; then
++  :
++else
++   nptl="no"
++fi
++
+ ##########################################
+ # SDL probe
+ 
+@@ -559,6 +579,7 @@
+ fi
+ echo "FMOD support      $fmod $fmod_support"
+ echo "kqemu support     $kqemu"
++echo "NPTL support      $nptl"
+ echo "Documentation     $build_docs"
+ [ ! -z "$uname_release" ] && \
+ echo "uname -r          $uname_release"
+@@ -880,6 +901,14 @@
+             echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
+         fi
+     fi
++else
++    if test "$nptl" = "yes" ; then
++        case "$target_cpu" in
++          arm | armeb)
++            echo "#define USE_NPTL 1" >> $config_h
++          ;;
++        esac
++    fi
+ fi
+ 
+ if test "$cocoa" = "yes" ; then
+Index: qemu/exec-all.h
+===================================================================
+--- qemu.orig/exec-all.h	2006-08-26 16:28:32.000000000 +0100
++++ qemu/exec-all.h	2006-08-26 16:31:53.000000000 +0100
+@@ -347,163 +347,7 @@
+ extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
+ extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
+ 
+-#ifdef __powerpc__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-    __asm__ __volatile__ (
+-                          "0:    lwarx %0,0,%1\n"
+-                          "      xor. %0,%3,%0\n"
+-                          "      bne 1f\n"
+-                          "      stwcx. %2,0,%1\n"
+-                          "      bne- 0b\n"
+-                          "1:    "
+-                          : "=&r" (ret)
+-                          : "r" (p), "r" (1), "r" (0)
+-                          : "cr0", "memory");
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __i386__
+-static inline int testandset (int *p)
+-{
+-    long int readval = 0;
+-    
+-    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+-                          : "+m" (*p), "+a" (readval)
+-                          : "r" (1)
+-                          : "cc");
+-    return readval;
+-}
+-#endif
+-
+-#ifdef __x86_64__
+-static inline int testandset (int *p)
+-{
+-    long int readval = 0;
+-    
+-    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+-                          : "+m" (*p), "+a" (readval)
+-                          : "r" (1)
+-                          : "cc");
+-    return readval;
+-}
+-#endif
+-
+-#ifdef __s390__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-
+-    __asm__ __volatile__ ("0: cs    %0,%1,0(%2)\n"
+-			  "   jl    0b"
+-			  : "=&d" (ret)
+-			  : "r" (1), "a" (p), "0" (*p) 
+-			  : "cc", "memory" );
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __alpha__
+-static inline int testandset (int *p)
+-{
+-    int ret;
+-    unsigned long one;
+-
+-    __asm__ __volatile__ ("0:	mov 1,%2\n"
+-			  "	ldl_l %0,%1\n"
+-			  "	stl_c %2,%1\n"
+-			  "	beq %2,1f\n"
+-			  ".subsection 2\n"
+-			  "1:	br 0b\n"
+-			  ".previous"
+-			  : "=r" (ret), "=m" (*p), "=r" (one)
+-			  : "m" (*p));
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __sparc__
+-static inline int testandset (int *p)
+-{
+-	int ret;
+-
+-	__asm__ __volatile__("ldstub	[%1], %0"
+-			     : "=r" (ret)
+-			     : "r" (p)
+-			     : "memory");
+-
+-	return (ret ? 1 : 0);
+-}
+-#endif
+-
+-#ifdef __arm__
+-static inline int testandset (int *spinlock)
+-{
+-    register unsigned int ret;
+-    __asm__ __volatile__("swp %0, %1, [%2]"
+-                         : "=r"(ret)
+-                         : "0"(1), "r"(spinlock));
+-    
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __mc68000
+-static inline int testandset (int *p)
+-{
+-    char ret;
+-    __asm__ __volatile__("tas %1; sne %0"
+-                         : "=r" (ret)
+-                         : "m" (p)
+-                         : "cc","memory");
+-    return ret;
+-}
+-#endif
+-
+-#ifdef __ia64
+-#include <ia64intrin.h>
+-
+-static inline int testandset (int *p)
+-{
+-    return __sync_lock_test_and_set (p, 1);
+-}
+-#endif
+-
+-typedef int spinlock_t;
+-
+-#define SPIN_LOCK_UNLOCKED 0
+-
+-#if defined(CONFIG_USER_ONLY)
+-static inline void spin_lock(spinlock_t *lock)
+-{
+-    while (testandset(lock));
+-}
+-
+-static inline void spin_unlock(spinlock_t *lock)
+-{
+-    *lock = 0;
+-}
+-
+-static inline int spin_trylock(spinlock_t *lock)
+-{
+-    return !testandset(lock);
+-}
+-#else
+-static inline void spin_lock(spinlock_t *lock)
+-{
+-}
+-
+-static inline void spin_unlock(spinlock_t *lock)
+-{
+-}
+-
+-static inline int spin_trylock(spinlock_t *lock)
+-{
+-    return 1;
+-}
+-#endif
++#include "qemu_spinlock.h"
+ 
+ extern spinlock_t tb_lock;
+ 
+Index: qemu/linux-user/arm/syscall.h
+===================================================================
+--- qemu.orig/linux-user/arm/syscall.h	2006-03-09 19:18:11.000000000 +0000
++++ qemu/linux-user/arm/syscall.h	2006-08-26 16:31:53.000000000 +0100
+@@ -28,7 +28,9 @@
+ #define ARM_SYSCALL_BASE	0x900000
+ #define ARM_THUMB_SYSCALL	0
+ 
+-#define ARM_NR_cacheflush (ARM_SYSCALL_BASE + 0xf0000 + 2)
++#define ARM_NR_BASE	  0xf0000
++#define ARM_NR_cacheflush (ARM_NR_BASE + 2)
++#define ARM_NR_set_tls	  (ARM_NR_BASE + 5)
+ 
+ #define ARM_NR_semihosting	  0x123456
+ #define ARM_NR_thumb_semihosting  0xAB
+Index: qemu/linux-user/main.c
+===================================================================
+--- qemu.orig/linux-user/main.c	2006-08-26 16:28:40.000000000 +0100
++++ qemu/linux-user/main.c	2006-08-26 16:31:53.000000000 +0100
+@@ -309,6 +309,50 @@
+     }
+ }
+ 
++/* Handle a jump to the kernel code page.  */
++static int
++do_kernel_trap(CPUARMState *env)
++{
++    uint32_t addr;
++    uint32_t *ptr;
++    uint32_t cpsr;
++
++    switch (env->regs[15]) {
++    case 0xffff0fc0: /* __kernel_cmpxchg */
++        /* XXX: This only works between threads, not between processes.
++           Use native atomic operations.  */
++        /* ??? This probably breaks horribly if the access segfaults.  */
++        cpu_lock();
++        ptr = (uint32_t *)env->regs[2];
++        cpsr = cpsr_read(env);
++        if (*ptr == env->regs[0]) {
++            *ptr = env->regs[1];
++            env->regs[0] = 0;
++            cpsr |= CPSR_C;
++        } else {
++            env->regs[0] = -1;
++            cpsr &= ~CPSR_C;
++        }
++        cpsr_write(env, cpsr, CPSR_C);
++        cpu_unlock();
++        break;
++    case 0xffff0fe0: /* __kernel_get_tls */
++        env->regs[0] = env->cp15.c13_tls;
++        break;
++    default:
++        return 1;
++    }
++    /* Jump back to the caller.  */
++    addr = env->regs[14];
++    if (addr & 1) {
++        env->thumb = 1;
++        addr &= ~1;
++    }
++    env->regs[15] = addr;
++
++    return 0;
++}
++
+ void cpu_loop(CPUARMState *env)
+ {
+     int trapnr;
+@@ -365,10 +409,8 @@
+                     }
+                 }
+ 
+-                if (n == ARM_NR_cacheflush) {
+-                    arm_cache_flush(env->regs[0], env->regs[1]);
+-                } else if (n == ARM_NR_semihosting
+-                           || n == ARM_NR_thumb_semihosting) {
++                if (n == ARM_NR_semihosting
++                    || n == ARM_NR_thumb_semihosting) {
+                     env->regs[0] = do_arm_semihosting (env);
+                 } else if (n == 0 || n >= ARM_SYSCALL_BASE
+                            || (env->thumb && n == ARM_THUMB_SYSCALL)) {
+@@ -379,14 +421,34 @@
+                         n -= ARM_SYSCALL_BASE;
+                         env->eabi = 0;
+                     }
+-                    env->regs[0] = do_syscall(env, 
+-                                              n, 
+-                                              env->regs[0],
+-                                              env->regs[1],
+-                                              env->regs[2],
+-                                              env->regs[3],
+-                                              env->regs[4],
+-                                              env->regs[5]);
++                    if ( n > ARM_NR_BASE) {
++                        switch (n)
++                          {
++                          case ARM_NR_cacheflush:
++                              arm_cache_flush(env->regs[0], env->regs[1]);
++                              break;
++#ifdef USE_NPTL
++                          case ARM_NR_set_tls:
++                              cpu_set_tls(env, env->regs[0]);
++                              env->regs[0] = 0;
++                              break;
++#endif
++                          default:
++                              printf ("Error: Bad syscall: %x\n", n);
++                              goto error;
++                          }
++                      }
++                    else
++                      {
++                        env->regs[0] = do_syscall(env, 
++                                                  n, 
++                                                  env->regs[0],
++                                                  env->regs[1],
++                                                  env->regs[2],
++                                                  env->regs[3],
++                                                  env->regs[4],
++                                                  env->regs[5]);
++                      }
+                 } else {
+                     goto error;
+                 }
+@@ -425,6 +487,10 @@
+                   }
+             }
+             break;
++        case EXCP_KERNEL_TRAP:
++            if (do_kernel_trap(env))
++              goto error;
++            break;
+         default:
+         error:
+             fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", 
+@@ -1639,6 +1705,10 @@
+         ts->heap_base = info->brk;
+         /* This will be filled in on the first SYS_HEAPINFO call.  */
+         ts->heap_limit = 0;
++        /* Register the magic kernel code page.  The cpu will generate a
++           special exception when it tries to execute code here.  We can't
++           put real code here because it may be in use by the host kernel.  */
++        page_set_flags(0xffff0000, 0xffff0fff, 0);
+     }
+ #elif defined(TARGET_SPARC)
+     {
+Index: qemu/linux-user/qemu.h
+===================================================================
+--- qemu.orig/linux-user/qemu.h	2006-08-26 16:28:40.000000000 +0100
++++ qemu/linux-user/qemu.h	2006-08-26 16:33:50.000000000 +0100
+@@ -75,6 +75,9 @@
+     uint32_t v86mask;
+ #endif
+     int used; /* non zero if used */
++#ifdef USE_NPTL
++    uint32_t *child_tidptr;
++#endif
+     struct image_info *info;
+     uint8_t stack[0];
+ } __attribute__((aligned(16))) TaskState;
+Index: qemu/linux-user/syscall.c
+===================================================================
+--- qemu.orig/linux-user/syscall.c	2006-08-26 16:28:40.000000000 +0100
++++ qemu/linux-user/syscall.c	2006-08-26 16:31:53.000000000 +0100
+@@ -66,9 +66,18 @@
+ #include <linux/kd.h>
+ 
+ #include "qemu.h"
++#include "qemu_spinlock.h"
+ 
+ //#define DEBUG
+ 
++#ifdef USE_NPTL
++#define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
++    CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
++#else
++/* XXX: Hardcode the above values.  */
++#define CLONE_NPTL_FLAGS2 0
++#endif
++
+ #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC)
+ /* 16 bit uid wrappers emulation */
+ #define USE_UID16
+@@ -1602,20 +1611,38 @@
+    thread/process */
+ #define NEW_STACK_SIZE 8192
+ 
++#ifdef USE_NPTL
++static spinlock_t nptl_lock = SPIN_LOCK_UNLOCKED;
++#endif
++
+ static int clone_func(void *arg)
+ {
+     CPUState *env = arg;
++#ifdef HAVE_NPTL
++    /* Wait until the parent has finshed initializing the tls state.  */
++    while (!spin_trylock(&nptl_lock))
++        usleep(1);
++    spin_unlock(&nptl_lock);
++#endif
+     cpu_loop(env);
+     /* never exits */
+     return 0;
+ }
+ 
+-int do_fork(CPUState *env, unsigned int flags, unsigned long newsp)
++int do_fork(CPUState *env, unsigned int flags, unsigned long newsp,
++            uint32_t *parent_tidptr, void *newtls,
++            uint32_t *child_tidptr)
+ {
+     int ret;
+     TaskState *ts;
+     uint8_t *new_stack;
+     CPUState *new_env;
++#ifdef USE_NPTL
++    unsigned int nptl_flags;
++
++    if (flags & CLONE_PARENT_SETTID)
++        *parent_tidptr = gettid();
++#endif
+     
+     if (flags & CLONE_VM) {
+         ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE);
+@@ -1665,16 +1692,60 @@
+ #error unsupported target CPU
+ #endif
+         new_env->opaque = ts;
++#ifdef USE_NPTL
++     nptl_flags = flags;
++     flags &= ~CLONE_NPTL_FLAGS2;
++     if (nptl_flags & CLONE_CHILD_CLEARTID) {
++          ts->child_tidptr = child_tidptr;
++     }
++     if (nptl_flags & CLONE_SETTLS)
++         cpu_set_tls (new_env, newtls);
++     /* Grab the global cpu lock so that the thread setup appears
++        atomic.  */
++     if (nptl_flags & CLONE_CHILD_SETTID)
++         spin_lock(&nptl_lock);
++#else
++     if (flags & CLONE_NPTL_FLAGS2)
++         return -EINVAL;
++#endif
++
+ #ifdef __ia64__
+         ret = __clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ #else
+ 	ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env);
+ #endif
++#ifdef USE_NPTL
++     if (ret != -1) {
++         if (nptl_flags & CLONE_CHILD_SETTID)
++             *child_tidptr = ret;
++     }
++     /* Allow the child to continue.  */
++     if (nptl_flags & CLONE_CHILD_SETTID)
++         spin_unlock(&nptl_lock);
++#endif
+     } else {
+-        /* if no CLONE_VM, we consider it is a fork */
+-        if ((flags & ~CSIGNAL) != 0)
+-            return -EINVAL;
+-        ret = fork();
++    /* if no CLONE_VM, we consider it is a fork */
++    if ((flags & ~(CSIGNAL | CLONE_NPTL_FLAGS2)) != 0)
++          return -EINVAL;
++      ret = fork();
++#ifdef USE_NPTL
++     /* There is a race condition here.  The parent process could
++        theoretically read the TID in the child process before the child
++        tid is set.  This would require using either ptrace
++        (not implemented) or having *_tidptr to point at a shared memory
++        mapping.  We can't repeat the spinlock hack used above because
++        the child process gets its own copy of the lock.  */
++     if (ret == 0) {
++         /* Child Process.  */
++         if (flags & CLONE_CHILD_SETTID)
++             *child_tidptr = gettid();
++         ts = (TaskState *)env->opaque;
++         if (flags & CLONE_CHILD_CLEARTID)
++             ts->child_tidptr = child_tidptr;
++         if (flags & CLONE_SETTLS)
++             cpu_set_tls (env, newtls);
++     }
++#endif
+     }
+     return ret;
+ }
+@@ -1918,7 +1989,7 @@
+         ret = do_brk(arg1);
+         break;
+     case TARGET_NR_fork:
+-        ret = get_errno(do_fork(cpu_env, SIGCHLD, 0));
++        ret = get_errno(do_fork(cpu_env, SIGCHLD, 0, NULL, NULL, NULL));
+         break;
+     case TARGET_NR_waitpid:
+         {
+@@ -2989,7 +3060,8 @@
+         ret = get_errno(fsync(arg1));
+         break;
+     case TARGET_NR_clone:
+-        ret = get_errno(do_fork(cpu_env, arg1, arg2));
++        ret = get_errno(do_fork(cpu_env, arg1, arg2, (uint32_t *)arg3,
++                        (void *)arg4, (uint32_t *)arg5));
+         break;
+ #ifdef __NR_exit_group
+         /* new thread calls */
+@@ -3339,7 +3411,8 @@
+ #endif
+ #ifdef TARGET_NR_vfork
+     case TARGET_NR_vfork:
+-        ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0));
++        ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0,
++                                NULL, NULL, NULL));
+         break;
+ #endif
+ #ifdef TARGET_NR_ugetrlimit
+@@ -3838,4 +3911,3 @@
+ #endif
+     return ret;
+ }
+-
+Index: qemu/target-arm/cpu.h
+===================================================================
+--- qemu.orig/target-arm/cpu.h	2006-03-09 19:18:27.000000000 +0000
++++ qemu/target-arm/cpu.h	2006-08-26 16:31:53.000000000 +0100
+@@ -35,6 +35,9 @@
+ #define EXCP_IRQ             5
+ #define EXCP_FIQ             6
+ #define EXCP_BKPT            7
++#define EXCP_KERNEL_TRAP     8   /* Jumped to kernel code page.  */
++
++
+ 
+ /* We currently assume float and double are IEEE single and double
+    precision respectively.
+@@ -85,6 +88,7 @@
+         uint32_t c9_data;
+         uint32_t c13_fcse; /* FCSE PID.  */
+         uint32_t c13_context; /* Context ID.  */
++        uint32_t c13_tls; /* Paul Brook told me to just add this ;)  */
+     } cp15;
+ 
+     /* Internal CPU feature flags.  */
+@@ -135,6 +139,15 @@
+ int cpu_arm_signal_handler(int host_signum, struct siginfo *info, 
+                            void *puc);
+ 
++void cpu_lock(void);
++void cpu_unlock(void);
++#if defined(USE_NPTL)
++static inline void cpu_set_tls(CPUARMState *env, void *newtls)
++{
++  env->cp15.c13_tls = (uint32_t)newtls;
++}
++#endif
++
+ #define CPSR_M (0x1f)
+ #define CPSR_T (1 << 5)
+ #define CPSR_F (1 << 6)
+@@ -146,7 +159,11 @@
+ #define CPSR_J (1 << 24)
+ #define CPSR_IT_0_1 (3 << 25)
+ #define CPSR_Q (1 << 27)
+-#define CPSR_NZCV (0xf << 28)
++#define CPSR_V (1 << 28)
++#define CPSR_C (1 << 29)
++#define CPSR_Z (1 << 30)
++#define CPSR_N (1 << 31)
++#define CPSR_NZCV (CPSR_N | CPSR_Z | CPSR_C | CPSR_V)
+ 
+ #define CACHED_CPSR_BITS (CPSR_T | CPSR_Q | CPSR_NZCV)
+ /* Return the current CPSR value.  */
+Index: qemu/target-arm/exec.h
+===================================================================
+--- qemu.orig/target-arm/exec.h	2006-03-09 19:18:27.000000000 +0000
++++ qemu/target-arm/exec.h	2006-08-26 16:31:53.000000000 +0100
+@@ -51,8 +51,6 @@
+ 
+ /* In op_helper.c */
+ 
+-void cpu_lock(void);
+-void cpu_unlock(void);
+ void helper_set_cp15(CPUState *, uint32_t, uint32_t);
+ uint32_t helper_get_cp15(CPUState *, uint32_t);
+ 
+Index: qemu/target-arm/op.c
+===================================================================
+--- qemu.orig/target-arm/op.c	2006-08-26 16:28:48.000000000 +0100
++++ qemu/target-arm/op.c	2006-08-26 16:31:53.000000000 +0100
+@@ -891,6 +891,12 @@
+     cpu_loop_exit();
+ }
+ 
++void OPPROTO op_kernel_trap(void)
++{
++    env->exception_index = EXCP_KERNEL_TRAP;
++    cpu_loop_exit();
++}
++
+ /* VFP support.  We follow the convention used for VFP instrunctions:
+    Single precition routines have a "s" suffix, double precision a
+    "d" suffix.  */
+Index: qemu/target-arm/translate.c
+===================================================================
+--- qemu.orig/target-arm/translate.c	2006-08-26 16:28:48.000000000 +0100
++++ qemu/target-arm/translate.c	2006-08-26 16:31:53.000000000 +0100
+@@ -2382,6 +2382,7 @@
+     s->is_jmp = DISAS_JUMP;
+ }
+ 
++
+ /* generate intermediate code in gen_opc_buf and gen_opparam_buf for
+    basic block 'tb'. If search_pc is TRUE, also generate PC
+    information for each intermediate instruction. */
+@@ -2416,6 +2417,15 @@
+     nb_gen_labels = 0;
+     lj = -1;
+     do {
++#ifdef CONFIG_USER_ONLY
++        /* Intercept jump to the magic kernel page.  */
++        if (dc->pc > 0xffff0000) {
++            gen_op_kernel_trap();
++            dc->is_jmp = DISAS_UPDATE;
++            break;
++        }
++#endif
++
+         if (env->nb_breakpoints > 0) {
+             for(j = 0; j < env->nb_breakpoints; j++) {
+                 if (env->breakpoints[j] == dc->pc) {
+Index: qemu/qemu_spinlock.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ qemu/qemu_spinlock.h	2006-08-26 16:31:53.000000000 +0100
+@@ -0,0 +1,182 @@
++/*
++ * internal execution defines for qemu
++ *
++ *  Copyright (c) 2003 Fabrice Bellard
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#ifndef _QEMU_SPINLOCK_H
++#define _QEMU_SPINLOCK_H
++
++#ifdef __powerpc__
++static inline int testandset (int *p)
++{
++    int ret;
++    __asm__ __volatile__ (
++                          "0:    lwarx %0,0,%1\n"
++                          "      xor. %0,%3,%0\n"
++                          "      bne 1f\n"
++                          "      stwcx. %2,0,%1\n"
++                          "      bne- 0b\n"
++                          "1:    "
++                          : "=&r" (ret)
++                          : "r" (p), "r" (1), "r" (0)
++                          : "cr0", "memory");
++    return ret;
++}
++#endif
++
++#ifdef __i386__
++static inline int testandset (int *p)
++{
++    long int readval = 0;
++
++    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
++                          : "+m" (*p), "+a" (readval)
++                          : "r" (1)
++                          : "cc");
++    return readval;
++}
++#endif
++
++#ifdef __x86_64__
++static inline int testandset (int *p)
++{
++    long int readval = 0;
++
++    __asm__ __volatile__ ("lock; cmpxchgl %2, %0"
++                          : "+m" (*p), "+a" (readval)
++                          : "r" (1)
++                          : "cc");
++    return readval;
++}
++#endif
++
++#ifdef __s390__
++static inline int testandset (int *p)
++{
++    int ret;
++
++    __asm__ __volatile__ ("0: cs    %0,%1,0(%2)\n"
++                         "   jl    0b"
++                         : "=&d" (ret)
++                         : "r" (1), "a" (p), "0" (*p)
++                         : "cc", "memory" );
++    return ret;
++}
++#endif
++
++#ifdef __alpha__
++static inline int testandset (int *p)
++{
++    int ret;
++    unsigned long one;
++
++    __asm__ __volatile__ ("0:  mov 1,%2\n"
++                         "     ldl_l %0,%1\n"
++                         "     stl_c %2,%1\n"
++                         "     beq %2,1f\n"
++                         ".subsection 2\n"
++                         "1:   br 0b\n"
++                         ".previous"
++                         : "=r" (ret), "=m" (*p), "=r" (one)
++                         : "m" (*p));
++    return ret;
++}
++#endif
++
++#ifdef __sparc__
++static inline int testandset (int *p)
++{
++       int ret;
++
++       __asm__ __volatile__("ldstub    [%1], %0"
++                            : "=r" (ret)
++                            : "r" (p)
++                            : "memory");
++
++       return (ret ? 1 : 0);
++}
++#endif
++
++#ifdef __arm__
++static inline int testandset (int *spinlock)
++{
++    register unsigned int ret;
++    __asm__ __volatile__("swp %0, %1, [%2]"
++                         : "=r"(ret)
++                         : "0"(1), "r"(spinlock));
++
++    return ret;
++}
++#endif
++
++#ifdef __mc68000
++static inline int testandset (int *p)
++{
++    char ret;
++    __asm__ __volatile__("tas %1; sne %0"
++                         : "=r" (ret)
++                         : "m" (p)
++                         : "cc","memory");
++    return ret;
++}
++#endif
++
++#ifdef __ia64
++#include <ia64intrin.h>
++
++static inline int testandset (int *p)
++{
++    return __sync_lock_test_and_set (p, 1);
++}
++#endif
++
++typedef int spinlock_t;
++
++#define SPIN_LOCK_UNLOCKED 0
++
++#if defined(CONFIG_USER_ONLY)
++static inline void spin_lock(spinlock_t *lock)
++{
++    while (testandset(lock));
++}
++
++static inline void spin_unlock(spinlock_t *lock)
++{
++    *lock = 0;
++}
++
++static inline int spin_trylock(spinlock_t *lock)
++{
++    return !testandset(lock);
++}
++#else
++static inline void spin_lock(spinlock_t *lock)
++{
++}
++
++static inline void spin_unlock(spinlock_t *lock)
++{
++}
++
++static inline int spin_trylock(spinlock_t *lock)
++{
++    return 1;
++}
++#endif
++
++#endif /* ! _QEMU_SPINLOCK_H */
diff --git a/packages/qemu/qemu-native_0.8.0.bb b/packages/qemu/qemu-native_0.8.0.bb
index acb5543a90..2b143bdc0f 100644
--- a/packages/qemu/qemu-native_0.8.0.bb
+++ b/packages/qemu/qemu-native_0.8.0.bb
@@ -1,5 +1,6 @@
 require qemu_${PV}.bb
 inherit native
+FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
 S = "${WORKDIR}/qemu-${PV}"
 prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
diff --git a/packages/qemu/qemu-native_0.8.2.bb b/packages/qemu/qemu-native_0.8.2.bb
new file mode 100644
index 0000000000..e064723e4e
--- /dev/null
+++ b/packages/qemu/qemu-native_0.8.2.bb
@@ -0,0 +1,7 @@
+require qemu_${PV}.bb
+EXTRA_OECONF = ""
+inherit native
+FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
+S = "${WORKDIR}/qemu-${PV}"
+prefix = "${STAGING_DIR}/${BUILD_SYS}"
+
diff --git a/packages/qemu/qemu_0.8.0.bb b/packages/qemu/qemu_0.8.0.bb
index fd7a892347..38bbcbacad 100644
--- a/packages/qemu/qemu_0.8.0.bb
+++ b/packages/qemu/qemu_0.8.0.bb
@@ -1,6 +1,9 @@
 LICENSE = "GPL"
 
-SRC_URI = "http://fabrice.bellard.free.fr/qemu/qemu-${PV}.tar.gz"
+SRC_URI = "http://fabrice.bellard.free.fr/qemu/qemu-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://arm_nptl.patch;patch=1"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/qemu/qemu_0.8.2.bb b/packages/qemu/qemu_0.8.2.bb
new file mode 100644
index 0000000000..49032fa59d
--- /dev/null
+++ b/packages/qemu/qemu_0.8.2.bb
@@ -0,0 +1,11 @@
+LICENSE = "GPL"
+
+SRC_URI = "http://fabrice.bellard.free.fr/qemu/qemu-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://pl110_rgb-r0.patch;patch=1 \
+           file://arm_nptl.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--cc=${CC}"
+
diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb
index 5697e69578..0dfe01aa11 100644
--- a/packages/qemu/qemu_cvs.bb
+++ b/packages/qemu/qemu_cvs.bb
@@ -1,11 +1,10 @@
 LICENSE = "GPL"
-PV = "0.8.0+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.8.2+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
            file://configure.patch;patch=1 \
-	   file://mouse_fix-r0.patch;patch=1 \
-	   file://pl110_rgb-r0.patch;patch=1"
+	   file://pl110_rgb-r0.patch;patch=1 \
+	   file://arm_nptl.patch;patch=1"
 
 S = "${WORKDIR}/qemu"
 
diff --git a/packages/quilt/quilt-native.inc b/packages/quilt/quilt-native.inc
index d19d864904..c8bbdc8e07 100644
--- a/packages/quilt/quilt-native.inc
+++ b/packages/quilt/quilt-native.inc
@@ -8,8 +8,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1"
 
 inherit autotools native
 
-PATCHCLEANCMD = ""
-PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
+PATCHTOOL = "patch"
 EXTRA_OECONF = "--disable-nls"
 
 do_configure () {
diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb
index 4daf98bfc8..ddd08c80b7 100644
--- a/packages/samba/samba_3.0.14a.bb
+++ b/packages/samba/samba_3.0.14a.bb
@@ -1,4 +1,4 @@
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -49,6 +49,7 @@ PACKAGES =+ "swat"
 
 FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
 #
 # bug fix for samba.inc:
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb
index 7f5bd3dffa..088c167cb1 100644
--- a/packages/samba/samba_3.0.20.bb
+++ b/packages/samba/samba_3.0.20.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -49,6 +49,7 @@ PACKAGES =+ "swat"
 
 FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
 #
 # bug fix for samba.inc:
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8"
diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc
index e39397be06..313b8e3d51 100644
--- a/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
+DESCRIPTION = "Virtual Machine for LucasArts Adventures"
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb
index 7cfd6ac0d0..9719ee200e 100644
--- a/packages/scummvm/scummvm_0.9.0.bb
+++ b/packages/scummvm/scummvm_0.9.0.bb
@@ -2,6 +2,11 @@ require scummvm.inc
 DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2"
 SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
 
+EXTRA_OECONF += "--enable-lure \
+		 --enable-agi \
+		 --enable-cine \
+		 "
+
 do_compile() {
 	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
                    DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT  -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
diff --git a/packages/subversion/subversion_1.3.2.bb b/packages/subversion/subversion_1.3.2.bb
new file mode 100644
index 0000000000..f508381d15
--- /dev/null
+++ b/packages/subversion/subversion_1.3.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util-0.9.12 neon"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache/BSD"
+HOMEPAGE = "http://subversion.tigris.org"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+           file://disable-revision-install.patch;patch=1"
+
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
+                --without-berkeley-db --without-apxs --without-apache \ 
+                --without-swig --with-apr=${STAGING_BINDIR} \
+                --with-apr-util=${STAGING_BINDIR}"
+
+inherit autotools
+
+do_configure() {
+	oe_runconf
+}
diff --git a/packages/swig/swig_1.3.29.bb b/packages/swig/swig_1.3.29.bb
new file mode 100644
index 0000000000..a36c7b9934
--- /dev/null
+++ b/packages/swig/swig_1.3.29.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
+HOMEPAGE = "http://swig.sourceforge.net/"
+LICENSE = "BSD"
+SECTION = "devel"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/swig/swig-${PV}.tar.gz"
+S = "${WORKDIR}/swig-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
+
+do_configure() {
+	oe_runconf
+}
+
diff --git a/packages/syslog-ng/files/syslog-ng.conf b/packages/syslog-ng/files/syslog-ng.conf
new file mode 100644
index 0000000000..4d1e9f8b22
--- /dev/null
+++ b/packages/syslog-ng/files/syslog-ng.conf
@@ -0,0 +1,89 @@
+#
+# Syslog-ng example configuration for for Debian GNU/Linux
+#
+# Copyright (c) 1999 anonymous
+# Copyright (c) 1999 Balazs Scheidler
+# $Id: syslog-ng.conf.sample,v 1.3 2003/05/20 08:57:27 asd Exp $
+#
+# Syslog-ng configuration file, compatible with default Debian syslogd
+# installation. 
+#
+
+options { long_hostnames(off); sync(0); };
+
+source src { file("/proc/kmsg"); unix-stream("/dev/log"); internal(); };
+source net { udp(); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(cron); };
+filter f_ppp { facility(local2); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn) 
+	and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(src); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
+
+
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index 734dc310fb..ce1f77813c 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -1,9 +1,10 @@
-PR = "r8"
+PR = "r9"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 
 SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+          file://syslog-ng.conf \
 	  file://initscript"
 
 S = "${WORKDIR}/${PN}-${PV}"
@@ -16,7 +17,7 @@ INITSCRIPT_PARAMS = "defaults 05"
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/${PN}
-	install ${S}/doc/syslog-ng.conf.sample ${D}${sysconfdir}/${PN}/syslog-ng.conf
+	install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}/syslog-ng.conf
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng
 }
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
new file mode 100644
index 0000000000..61b8744105
--- /dev/null
+++ b/packages/tasks/task-base.bb
@@ -0,0 +1,255 @@
+DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
+MAINTAINER = "Richard Purdie <richard@openedhand.com>"
+PR = "r0"
+
+PACKAGES = "task-base \
+            task-base-oh-minimal"
+
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Valid only in MACHINE_FEATURES:
+#
+# kernel24
+# kernel26
+# apm
+
+# Valid only in DISTO_FEATURES:
+#
+# nfs
+# smbfs
+# ipsec
+# wifi
+# ppp
+
+# Valid COMBINED_FEATURES:
+# (These features need to be supported by both the machine and the distro)
+#
+# alsa
+# bluetooth
+# ext2
+# irda
+# pcmcia
+# usbgadget
+# usbhost
+
+
+MACHINE_FEATURES ?= "kernel26"
+DISTRO_FEATURES ?= ""
+
+DISTRO_EXTRA_RDEPENDS ?= ""
+DISTRO_EXTRA_RRECOMMENDS ?= ""
+MACHINE_EXTRA_RDEPENDS ?= ""
+MACHINE_EXTRA_RRECOMMENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+
+COMBINED_FEATURES = "\
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}"
+
+
+#
+# task-base 
+#
+RDEPENDS_task-base = "\
+    kernel \
+    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
+    ${MACHINE_EXTRA_RDEPENDS} \
+    ${DISTRO_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-base = "\
+    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+    ${MACHINE_EXTRA_RRECOMMENDS} \
+    ${DISTRO_EXTRA_RRECOMMENDS}"
+
+
+#
+# task-base-oh-minimal
+# An example of a small cut down machine configuration
+#
+RDEPENDS_task-base-oh-minimal = "\
+    kernel \
+    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
+    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-base-minimal = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+
+task-base-kernel26-rdepends = "\
+    udev \
+    keymaps \
+    sysfsutils \
+    module-init-tools"
+
+task-base-kernel26-extras-rrecommends = "\
+    kernel-module-input \
+    kernel-module-uinput"
+
+task-base-apm-rdepends = "\
+    apm \
+    apmd \
+    ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}"
+
+task-base-ext2-rdepends = "\
+    hdparm \
+    e2fsprogs \
+    e2fsprogs-e2fsck \
+    e2fsprogs-mke2fs"
+
+task-base-alsa-rdepends = "\
+    alsa-utils-alsactl \
+    alsa-utils-alsamixer \
+    alsa-conf"
+
+task-base-alsa-rrecommends = "\
+    kernel-module-snd-mixer-oss \
+    kernel-module-snd-pcm-oss"
+
+task-base-pcmcia-rdepends = "\
+    ${PCMCIA_MANAGER} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}"
+
+task-base-pcmcia-rrecommends = "\
+    kernel-module-airo-cs \
+    kernel-module-pcnet-cs \
+    kernel-module-serial-cs \
+    kernel-module-hostap-cs \
+    kernel-module-ide-cs \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}"
+
+task-base-bluetooth-rrecommends = "\
+    kernel-module-bluetooth \
+    kernel-module-l2cap \
+    kernel-module-rfcomm \
+    kernel-module-hci-vhci \
+    kernel-module-bnep \
+    kernel-module-hidp \
+    kernel-module-hci-uart \
+    kernel-module-sco \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)}"
+
+task-base-irda-rdepends = "\
+    irda-utils"
+
+task-base-irda-rrecommends = "\
+    kernel-module-pxaficp-ir \
+    kernel-module-irda \
+    kernel-module-ircomm \
+    kernel-module-ircomm-tty \
+    kernel-module-irlan \
+    kernel-module-irnet \
+    kernel-module-irport \
+    kernel-module-irtty \
+    kernel-module-ir-usb"
+
+task-base-usbgadget-rrecommends = "\
+    kernel-module-gadgetfs \
+    kernel-module-g-file-storage \
+    kernel-module-g-serial \
+    kernel-module-g-ether"
+
+task-base-usbhost-rrecommends = "\
+    kernel-module-ohci-hcd \
+    kernel-module-usbcore \
+    kernel-module-usbhid \
+    kernel-module-usbnet \
+    kernel-module-sd-mod \
+    kernel-module-scsi-mod \
+    kernel-module-usbmouse \
+    kernel-module-mousedev \
+    kernel-module-hci-usb \
+    kernel-module-usbserial \
+    kernel-module-usb-storage \
+    kernel-module-ir-usb"
+
+task-distro-ppp-rdepends = "\
+    ppp \
+    ppp-dialin"
+
+task-distro-ppp-rrecommends = "\
+    kernel-module-ppp-async \
+    kernel-module-ppp-deflate \
+    kernel-module-ppp-mppe"
+
+task-distro-ipsec-rdepends = "\
+    openswan"
+
+task-distro-ipsec-rrecommends = "\
+    kernel-module-ipsec"
+
+task-distro-wifi-rdepends = "\
+    wireless-tools \
+    hostap-utils \
+    wpa-supplicant-nossl"
+
+task-distro-smbfs-rrecommends = "\
+    kernel-module-smbfs"
+
+task-distro-cramfs-rrecommends = "\
+    kernel-module-cramfs"
+
+task-distro-nfs-rrecommends = "\
+    kernel-module-nfs \
+    kernel-module-lockd \
+    kernel-module-sunrpc"
+
+
+# Tosort
+# kernel-module-ipv6 
+# kernel-module-ipsec
+# kernel-module-nvrd
+# kernel-module-mip6-mn
+# kernel-module-tun
+# kernel-module-ide-disk 
+# kernel-module-ide-probe-mo
+# kernel-module-loop
+# kernel-module-vfat 
+# kernel-module-ext2
+# kernel-module-nfs
+# kernel-module-sco 
+# kernel-module-af_packet
+# kernel-module-ip-gre 
+# kernel-module-ip-tables 
+# kernel-module-ipip
+# kernel-module-des 
+# kernel-module-md5
+# kernel-module-8250
+# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz 
diff --git a/packages/tin/files/.mtn2git_empty b/packages/tin/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tin/files/.mtn2git_empty
diff --git a/packages/tin/tin-1.7.3/configure.patch b/packages/tin/files/configure.patch
index 4059fe086f..4059fe086f 100644
--- a/packages/tin/tin-1.7.3/configure.patch
+++ b/packages/tin/files/configure.patch
diff --git a/packages/tin/tin-1.7.3/m4.patch b/packages/tin/files/m4.patch
index 9277f6c1b3..9277f6c1b3 100644
--- a/packages/tin/tin-1.7.3/m4.patch
+++ b/packages/tin/files/m4.patch
diff --git a/packages/tin/tin-1.7.3/makecfg-buildcc.patch b/packages/tin/files/makecfg-buildcc.patch
index 2b3dba44f9..2b3dba44f9 100644
--- a/packages/tin/tin-1.7.3/makecfg-buildcc.patch
+++ b/packages/tin/files/makecfg-buildcc.patch
diff --git a/packages/tin/tin_1.7.3.bb b/packages/tin/tin_1.7.3.bb
index aff987a555..3383f74757 100644
--- a/packages/tin/tin_1.7.3.bb
+++ b/packages/tin/tin_1.7.3.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Tin is a powerful text mode news reader."
 SECTION = "console/network"
 DEPENDS = "ncurses"
-PR = "r1"
 LICENSE = "GPL"
+PR = "r3"
+
 SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
 	   file://makecfg-buildcc.patch;patch=1 \
 	   file://m4.patch;patch=1 \
@@ -11,8 +12,9 @@ SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
 inherit autotools 
 
 EXTRA_OECONF = "--with-screen=ncurses"
+CFLAGS += "-DM_UNIX"
 
-do_compile () {
+do_compile() {
         ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c pcre/dftables.c
         ${BUILD_CC} dftables.o -o pcre/dftables
         oe_runmake build
diff --git a/packages/tin/tin_1.9.1.bb b/packages/tin/tin_1.9.1.bb
new file mode 100644
index 0000000000..560184f413
--- /dev/null
+++ b/packages/tin/tin_1.9.1.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Tin is a powerful text mode news reader."
+SECTION = "console/network"
+DEPENDS = "ncurses pcre"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
+	   file://m4.patch;patch=1"
+
+inherit autotools 
+
+PARALLEL_MAKE = ""
+EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.."
+
+export BUILD_CFLAGS += "-I${S}/include -DHAVE_CONFIG_H"
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile() {
+	cd src && oe_runmake
+}
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 6a4bc321c9..ddd6c5ad6d 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -5,9 +5,8 @@ SECTION = "base"
 LICENSE = "LGPL"
 
 PR = "r0"
-SRCDATE_tslib = "now"
 
-SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \
+SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.conf \
            file://ts-2.6.conf \
            file://ts.conf-h3600-2.4 \
@@ -17,7 +16,6 @@ SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};prot
            file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
-S = "${WORKDIR}/${PV}"
 
 inherit autotools pkgconfig
 
@@ -71,7 +69,6 @@ do_install_append() {
 }
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
-CONFFILES_${PN} = "${sysconfdir}/ts.conf"
 
 RDEPENDS_tslib-conf_h1940 = "detect-stylus"
 RDEPENDS_tslib-conf_h2200 = "detect-stylus"
@@ -82,17 +79,21 @@ RDEPENDS_tslib-conf_h6300 = "detect-stylus"
 RDEPENDS_tslib-conf_blueangel = "detect-stylus"
 RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
 RDEPENDS_tslib-conf_h4000 = "detect-stylus"
-RDEPENDS_tslib-conf_ipaq-pxa270 = "detect-stylus"
 
 PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
 
-PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
+PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
+DEBIAN_NOAUTONAME_tslib-conf = "1"
+DEBIAN_NOAUTONAME_tslib-tests = "1"
+DEBIAN_NOAUTONAME_tslib-calibrate = "1"
 
-RDEPENDS_libts = "tslib-conf"
+RDEPENDS_${PN} = "tslib-conf"
 
+
+FILES_${PN}-dbg += "${libdir}/ts/.debug*"
 FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
-FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*"
+FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
 FILES_libts-dev = "${FILES_tslib-dev}"
 FILES_tslib-calibrate += "${bindir}/ts_calibrate"
 FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test"
diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb
index 9a2a34341a..55884a8b49 100644
--- a/packages/tslib/tslib_20060703.bb
+++ b/packages/tslib/tslib_20060703.bb
@@ -84,7 +84,6 @@ RDEPENDS_tslib-conf_h6300 = "detect-stylus"
 RDEPENDS_tslib-conf_blueangel = "detect-stylus"
 RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
 RDEPENDS_tslib-conf_h4000 = "detect-stylus"
-RDEPENDS_tslib-conf_ipaq-pxa270 = "detect-stylus"
 
 PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb
index 5ff012555e..0174fc0560 100644
--- a/packages/uboot/uboot_cvs.bb
+++ b/packages/uboot/uboot_cvs.bb
@@ -10,7 +10,7 @@ PROVIDES = "virtual/bootloader"
 
 S = "${WORKDIR}/u-boot"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
+SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
 	   file://arm_flags.patch;patch=1"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
diff --git a/packages/udev/udev-097/links.conf b/packages/udev/udev-097/links.conf
new file mode 100644
index 0000000000..ee26012039
--- /dev/null
+++ b/packages/udev/udev-097/links.conf
@@ -0,0 +1,20 @@
+# This file does not exist. Please do not ask the debian maintainer about it.
+# You may use it to do strange and wonderful things, at your risk.
+
+L fd		/proc/self/fd
+L stdin		/proc/self/fd/0
+L stdout	/proc/self/fd/1
+L stderr	/proc/self/fd/2
+L core		/proc/kcore
+L sndstat	/proc/asound/oss/sndstat
+
+D pts
+D shm
+
+# Hic sunt leones.
+M ppp		c 108 0
+D loop
+M loop/0	b 7 0
+D net
+M net/tun	c 10 200
+
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 2e9e8d500f..fe24573b8d 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch
new file mode 100644
index 0000000000..abb3b137da
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile	2006-08-23 12:50:56.000000000 +0200
++++ trunk/src/Makefile	2006-08-23 12:52:45.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared p80211 prism2
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile	2006-08-23 12:50:55.000000000 +0200
++++ trunk/src/prism2/Makefile	2006-08-23 12:52:09.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=driver ridlist
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 623275c921..9a0797fb00 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -13,7 +13,6 @@ SRC_URI = "file://no-compat.patch;patch=1 \
 #	file://module_param_array.patch;patch=1 \
 	file://scripts-makefile-hostcc.patch;patch=1 \
 	file://pcmciasrc.patch;patch=1 \
-	file://pcmcia-driver.patch;patch=1 \
 	file://config.in"
 
 inherit module
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
new file mode 100644
index 0000000000..ade99ac50d
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
@@ -0,0 +1,8 @@
+require wlan-ng-modules.inc
+
+SRCDATE = "20060823"
+PV = "0.2.4+svn${SRCDATE}"
+
+SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
+S = "${WORKDIR}/trunk"
+
diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
index e932ee7df0..a1826a36f3 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,7 +1,10 @@
 require wlan-ng-modules.inc
 PR = "r0"
-PV = "0.2.3+svn${SRCDATE}"
+PV = "0.2.4+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
 S = "${WORKDIR}/trunk"
 
+DEFAULT_PREFERENCE = "-1"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-modules' ], d)}"
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
new file mode 100644
index 0000000000..be01488a92
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
@@ -0,0 +1,21 @@
+WLAN_VERSION=0
+WLAN_PATCHLEVEL=2
+WLAN_SUBLEVEL=3
+WLAN_EXTRAVERSION=
+#LINUX_SRC=$(KERNEL_SOURCE)
+PCMCIA_SRC=.
+PREFIX=
+INST_EXEDIR=/sbin
+#TARGET_ROOT_ON_HOST=
+#RC_DIR=/etc/init.d
+PCMCIA_DIR=/etc/pcmcia
+SYSV_INIT=y
+INSTALL_DEPMOD=
+WLAN_DEBUG=n
+CROSS_COMPILE_ENABLED=n
+CROSS_COMPILE=
+HOST_COMPILE=
+PRISM2_PLX=y
+PRISM2_PCMCIA=y
+PRISM2_PCI=y
+PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
new file mode 100644
index 0000000000..af1f442a4c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile	2006-08-21 16:24:58.000000000 +0200
++++ trunk/src/Makefile	2006-08-23 12:49:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile	2006-08-21 16:24:57.000000000 +0200
++++ trunk/src/prism2/Makefile	2006-08-23 12:48:32.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=ridlist download
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
new file mode 100644
index 0000000000..27cb04e97f
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "linux-wlan-ng userland utilities"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/userland"
+DEPENDS = "virtual/kernel"
+LICENSE = "GPL"
+
+SRCDATE = "20060823"
+PV = "0.2.4+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
+	file://only-the-utils.patch;patch=1 \
+	file://scripts-makefile-hostcc.patch;patch=1 \
+	file://pcmciasrc.patch;patch=1 \
+	file://hostldflags.patch;patch=1 \
+	file://wlan-ng.modutils \
+	file://wlan.agent \
+	file://usbctl \
+	file://resume \
+	file://pre-up \
+	file://post-down \
+	file://config.in"
+S = "${WORKDIR}/trunk"
+
+# yeah, it's kind of backwards, but otherwise the config step will fail
+inherit module
+
+do_configure() {
+	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
+	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+
+        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+                echo "PRISM2_PCMCIA=y"          >> config.mk
+                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+        fi
+        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
+	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
+        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
+        echo "RC_DIR=${sysconfdir}/"             >> config.mk
+	echo "CC=${CC}"			>> config.mk
+	echo "LD=${LD}"			>> config.mk
+
+	# Shut up, you broken buildsystem
+	install -m 0655 config.mk src/prism2/config.mk
+	install -d src/prism2/driver/include
+	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
+	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
+}
+
+do_compile() {
+	oe_runmake all
+}
+
+do_install() {
+	oe_runmake install
+	mkdir -p ${D}${sysconfdir}/modutils/
+	mkdir -p ${D}${sysconfdir}/hotplug/
+	mkdir -p ${D}${base_sbindir}/
+	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
+	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
+	install -d ${D}${sysconfdir}/network/if-post-down.d
+	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
+	install -d ${D}${sysconfdir}/apm/resume.d
+	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
+	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
+	install -d ${D}${mandir}/man1
+	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+}
+
+FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index bf9522fa38..c85779abc2 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/userland"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
 PR = "r2"
-PV = "0.2.3+svn${SRCDATE}"
+PV = "0.2.4+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
 	file://only-the-utils.patch;patch=1 \
@@ -69,3 +69,7 @@ do_install() {
 }
 
 FILES_${PN} = "/etc /sbin"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-utils' ], d)}"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
index 268255c39e..03aa3f6d0d 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb
@@ -26,13 +26,13 @@ do_compile () {
 
 do_install () {
 	install -d ${D}${sbindir}
-	install -m755 wpa_supplicant ${D}${sbindir}
-	install -m755 wpa_passphrase ${D}${sbindir}
-	install -m755 wpa_cli        ${D}${sbindir}
+	install -m 755 wpa_supplicant ${D}${sbindir}
+	install -m 755 wpa_passphrase ${D}${sbindir}
+	install -m 755 wpa_cli        ${D}${sbindir}
 
 	install -d ${D}${sysconfdir}
-	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
+	install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
 
 	install -d ${D}${docdir}/wpa_supplicant
-	install -m644 README ${D}${docdir}/wpa_supplicant
+	install -m 644 README ${D}${docdir}/wpa_supplicant
 }
diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb
index 9ee59cef29..ba6c1e115c 100644
--- a/packages/xmms/xmms_1.2.10.bb
+++ b/packages/xmms/xmms_1.2.10.bb
@@ -3,14 +3,17 @@ HOMEPAGE = "http://www.xmms.org/"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
 # TODO add esd
-DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib"
+DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib libsm esound"
 
 SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \
            file://gcc4.patch;patch=1 \
            file://xmms-config-dequote.patch;patch=1 \
 	   file://acinclude.m4 \
            file://xmms.sh"
-PR = "r2"
+PR = "r3"
+
+RRECOMMENDS_${PN} = "xmms-plugin-output-oss xmms-plugin-output-alsa \
+                    xmms-mad xmms-tremor"
 
 inherit autotools binconfig
 
@@ -35,6 +38,31 @@ do_install_append() {
 	install xmms/xmms_mini.xpm ${D}${datadir}/pixmaps
 }
 
+PACKAGES_DYNAMIC = "xmms-plugin-effect-* xmms-plugin-general-* \
+                    xmms-plugin-input-* xmms-plugin-output-* \
+		    xmms-plugin-visualisation-*"
+
+python populate_packages_prepend () {
+	import os.path
+
+	xmms_libdir = bb.data.expand('${libdir}/xmms', d)
+	effects_root = os.path.join(xmms_libdir, 'Effect')
+	general_root = os.path.join(xmms_libdir, 'General')
+	input_root = os.path.join(xmms_libdir, 'Input')
+	output_root = os.path.join(xmms_libdir, 'Output')
+	visualisation_root = os.path.join(xmms_libdir, 'Visualization')
+
+	do_split_packages(d, effects_root, '^lib(.*)\.so$', 'xmms-plugin-effect-%s', 'XMMS Effect plugin for %s')
+	do_split_packages(d, general_root, '^lib(.*)\.so$', 'xmms-plugin-general-%s', 'XMMS General plugin for %s')
+	do_split_packages(d, input_root, '^lib(.*)\.so$', 'xmms-plugin-input-%s', 'XMMS Input plugin for %s')
+	do_split_packages(d, output_root, '^lib(.*)\.so$', 'xmms-plugin-output-%s', 'XMMS Output plugin for %s')
+	do_split_packages(d, visualisation_root, '^lib(.*)\.so$', 'xmms-plugin-visualization-%s', 'XMMS Visualization plugin for %s')
+}
+
 do_stage() {
 	autotools_stage_all
 }
+
+FILES_${PN} = "${bindir}/xmms ${bindir}/xmms.sh ${libdir}/libxmms*.so.* \
+               ${datadir}/applications/xmms.desktop \
+	       ${datadir}/pixmaps/xmms_mini.xpm"
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index b31ed72998..2f4a5706d5 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -1,5 +1,7 @@
 require xorg-lib-common.inc
 
+PR = "r1"
+
 DESCRIPTION = "Base X libs."
 
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb
new file mode 100644
index 0000000000..df23f22b11
--- /dev/null
+++ b/packages/xorg-lib/libxcalibrate_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "	Touchscreen calibration client library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "BSD-X"
+
+PV = "0.0+git${DATE}"
+
+DEPENDS = "virtual/libx11 calibrateproto libxext"
+
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
new file mode 100644
index 0000000000..964380d943
--- /dev/null
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -0,0 +1,9 @@
+require xorg-proto-common.inc
+
+DESCRIPTION = "	Touchscreen calibration protocol"
+
+PV = "0.0+git${DATE}"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
+S = "${WORKDIR}/git"
+
diff --git a/packages/xorg-util/xorg-util-common.inc b/packages/xorg-util/xorg-util-common.inc
index f00a29a21c..93750f3757 100644
--- a/packages/xorg-util/xorg-util-common.inc
+++ b/packages/xorg-util/xorg-util-common.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/util/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson.patch
new file mode 100644
index 0000000000..63b13a4511
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/enable-epson.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am	2006-08-30 09:51:21.000000000 +0200
++++ git/hw/kdrive/Makefile.am	2006-08-30 09:51:44.425780000 +0200
+@@ -4,7 +4,7 @@
+ endif
+ 
+ if KDRIVEFBDEV
+-FBDEV_SUBDIRS = fbdev
++FBDEV_SUBDIRS = fbdev epson
+ endif
+ 
+ if XSDLSERVER
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 90fa12aebb..9c967db254 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -1,21 +1,35 @@
 PV = "1.1.0+git${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
+PR = "r3"
+
 LICENSE = "MIT"
-DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib virtual/libsdl libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version"
+
+FILES_${PN} += "${libdir}/xserver/SecurityPolicy"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-fake = "${bindir}/Xfake"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-sdl = "${bindir}/Xsdl"
+
+RDEPENDS_xserver-kdrive-fbdev = "${PN}"
+RDEPENDS_xserver-kdrive-fake = "${PN}"
+RDEPENDS_xserver-kdrive-xephyr = "${PN}"
+RDEPENDS_xserver-kdrive-epson = "${PN}"
+RDEPENDS_xserver-kdrive-sdl = "${PN}"
 
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
 	file://kmode.patch;patch=1 \
@@ -26,8 +40,9 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
 	file://fbdev-not-fix.patch;patch=1  \
 	file://enable-builtin-fonts.patch;patch=1 \
 	file://optional-xkb.patch;patch=1 \
+	file://enable-epson.patch;patch=1 \
 #	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
-	file://enable-tslib.patch;patch=1"
+	"
 
 SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
@@ -45,4 +60,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
 		--disable-xevie --disable-xprint --disable-xtrap \
 		--disable-dmx \
 		--with-default-font-path=built-ins \
+		--enable-tslib --enable-xcalibrate \
 		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+
+
diff --git a/packages/zsafe/.mtn2git_empty b/packages/zsafe/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zsafe/.mtn2git_empty
diff --git a/packages/zsafe/zsafe_2.1.3.bb b/packages/zsafe/zsafe_2.1.3.bb
new file mode 100644
index 0000000000..f4b9d0c5ab
--- /dev/null
+++ b/packages/zsafe/zsafe_2.1.3.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Password manager"
+SECTION     = "opie/applications"
+PRIORITY    = "optional"
+MAINTAINER  = "Carsten Schneider <zcarsten@gmx.net>"
+LICENSE     = "GPL"
+RCONFLICTS  = "opie-zsafe"
+APPNAME     = "zsafe"
+APPTYPE     = "binary"
+APPDESKTOP  = "${WORKDIR}"
+SRC_URI     = "http://z-soft.z-portal.info/zsafe/zsafe_2.1.3.tgz"
+S           = "${WORKDIR}"
+
+inherit opie
+
+QMAKE_PROFILES = "zsafe.pro"
+
+export OE_QMAKE_LINK="${CXX}"
+
+#FILES bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/zsafe.png
+
+FILES_zsafe = "zsafe"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/zsafe.png ${D}${palmtopdir}/pics/
+}
author	Erik Hovland <erik@hovland.org>	2006-08-30 18:42:42 +0000
committer	Erik Hovland <erik@hovland.org>	2006-08-30 18:42:42 +0000
commit	4d36c0d6c6c4e6ed9f148d70588fdb16798e9b9c (patch)
tree	e1e2d433887f193ea6be861ece68309e7d667619
parent	ff49b42aedb3c09f71cb35456140b9afcf6b40b8 (diff)
parent	71bd0cd9cf4addbc38028705674fb56c2a644071 (diff)